@aics/vole-app 2.14.0 → 3.1.1

package/es/aics-image-viewer/shared/utils/urlParsing.js

@@ -1,10 +1,10 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _ViewerChannelSetting, _ViewerChannelSetting2, _ViewerChannelSetting3, _ViewerChannelSetting4, _ViewerChannelSetting5, _ViewerChannelSetting6, _ViewerChannelSetting7, _ViewerChannelSetting8, _ViewerChannelSetting9, _ViewerChannelSetting10, _ViewerChannelSetting11, _ViewerStateKeys$View, _ViewerStateKeys$Mode, _ViewerStateKeys$Mask, _ViewerStateKeys$Imag, _ViewerStateKeys$Axes, _ViewerStateKeys$Boun, _ViewerStateKeys$Boun2, _ViewerStateKeys$Back, _ViewerStateKeys$Auto, _ViewerStateKeys$Brig, _ViewerStateKeys$Dens, _ViewerStateKeys$Leve, _ViewerStateKeys$Inte, _ViewerStateKeys$Regi, _ViewerStateKeys$Slic, _ViewerStateKeys$Time, _ViewerStateKeys$Scen, _ViewerStateKeys$Came;
+var _ViewerChannelSetting, _ViewerChannelSetting2, _ViewerChannelSetting3, _ViewerChannelSetting4, _ViewerChannelSetting5, _ViewerChannelSetting6, _ViewerChannelSetting7, _ViewerChannelSetting8, _ViewerChannelSetting9, _ViewerChannelSetting10, _ViewerChannelSetting11, _ViewerChannelSetting12, _ViewerChannelSetting13, _ViewerChannelSetting14, _ViewerStateKeys$View, _ViewerStateKeys$Mode, _ViewerStateKeys$Mask, _ViewerStateKeys$Imag, _ViewerStateKeys$Axes, _ViewerStateKeys$Boun, _ViewerStateKeys$Boun2, _ViewerStateKeys$Back, _ViewerStateKeys$Auto, _ViewerStateKeys$Brig, _ViewerStateKeys$Dens, _ViewerStateKeys$Leve, _ViewerStateKeys$Inte, _ViewerStateKeys$Regi, _ViewerStateKeys$Slic, _ViewerStateKeys$Time, _ViewerStateKeys$Scen, _ViewerStateKeys$Came;
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
@@ -28,54 +28,55 @@ import { ImageType, RenderMode, ViewMode } from "../enums";
 import { removeMatchingProperties, removeUndefinedProperties } from "./datatypes";
 import FirebaseRequest from "./firebase";
 import { clamp } from "./math";
+import { readStoredMetadata, readStoredScenes } from "./storage";
 export var ENCODED_COMMA_REGEX = /%2C/g;
 export var ENCODED_COLON_REGEX = /%3A/g;
 var DEFAULT_CONTROL_POINT_COLOR = [255, 255, 255];
 var DEFAULT_CONTROL_POINT_COLOR_CODE = "1";
-
-/** If the `url` query param equals this, parse image url(s) and metadata from local storage instead of params */
-var URL_FETCH_FROM_STORAGE = "storage";
-
-// TODO: refactor regexes to be composed of one another rather than duplicating code
-// const COLOR_CODES: Record<string, ColorArray> = {
-//   "0": [0, 0, 0],
-//   "1": [255, 255, 255],
-//   "-1": [255, 255, 255],
-//   w: [255, 255, 255],
-//   k: [0, 0, 0],
-// };
-// const COLOR_CODE_REGEX = new RegExp(`(${Object.keys(COLOR_CODES).join("|")})`);
-// const HEX_COLOR_REGEX = new RegExp(`(([0-9a-fA-F]{6})|${COLOR_CODE_REGEX.source})`);
-
+var FLOAT_REGEX = /-?[0-9]*.?[0-9]+/;
 var CHANNEL_STATE_KEY_REGEX = /^c[0-9]+$/;
+
 /** Match colon-separated pairs of alphanumeric strings */
 var LUT_REGEX = /^-?[a-z0-9.]*:[ ]*-?[a-z0-9.]*$/;
-/** Match colon-separated pairs of numeric strings */
-var RAMP_REGEX = /^-?[0-9.]*:-?[0-9.]*$/;
+
+/**
+ * Match colon-separated pairs of numeric strings, representing histogram bin
+ * indices or intensity values.
+ */
+var RAMP_REGEX = new RegExp("^".concat(FLOAT_REGEX.source, ":").concat(FLOAT_REGEX.source, "$"));
+
 /**
  * Match comma-separated triplet of numeric strings.
  */
-var SLICE_REGEX = /^[0-9.]*,[0-9.]*,[0-9.]*$/;
+var SLICE_REGEX = new RegExp("^".concat(FLOAT_REGEX.source, ",").concat(FLOAT_REGEX.source, ",").concat(FLOAT_REGEX.source, "$"));
+
 /**
  * Matches a sequence of three comma-separated min:max number pairs, representing
  * the x, y, and z axes.
  */
-var REGION_REGEX = /^([0-9.]*:[0-9.]*)(,[0-9.]*:[0-9.]*){2}$/;
+var REGION_REGEX = new RegExp("^(".concat(FLOAT_REGEX.source, ":").concat(FLOAT_REGEX.source, ")(,").concat(FLOAT_REGEX.source, ":").concat(FLOAT_REGEX.source, "){2}$"));
 var HEX_COLOR_REGEX = new RegExp("(([0-9a-fA-F]{6})|".concat(DEFAULT_CONTROL_POINT_COLOR_CODE, ")"));
-var NUMERIC_REGEX = /-?[0-9.]*/;
-var CONTROL_POINT_REGEX = new RegExp("(".concat(NUMERIC_REGEX.source, ":").concat(NUMERIC_REGEX.source, ":").concat(HEX_COLOR_REGEX.source, ")"));
+
+/** Represents control points specified by bin indices. */
+var CONTROL_POINT_REGEX = new RegExp("(".concat(FLOAT_REGEX.source, ":").concat(FLOAT_REGEX.source, ":").concat(HEX_COLOR_REGEX.source, ")"));
 var HEX_COLOR_STR_REGEX = new RegExp("^".concat(HEX_COLOR_REGEX.source, "$"));
 
 /**
  * LEGACY: Matches a COMMA-separated list of control points, where each control point is represented
  * by a triplet of `{x}:{opacity}:{hex color}`.
- * The hex color can be replaced with `w` to represent white (`ffffff`).
+ * The hex color can be replaced with `1` to represent white (`ffffff`).
  */
 export var LEGACY_CONTROL_POINTS_REGEX = new RegExp("^".concat(CONTROL_POINT_REGEX.source, "(,").concat(CONTROL_POINT_REGEX.source, ")*$"));
+
 /**
- * Matches a COLON-separated list of control points, where each control point is represented
- * by a triplet of `{x}:{opacity}:{hex color}`.
- * The hex color can be replaced with `w` to represent white (`ffffff`).
+ * Matches a COLON-separated list of control points, where each control point is
+ * represented by a triplet of `{x}:{opacity}:{hex color}`.
+ * - `x` is a value that will either be parsed as a histogram bin index (legacy,
+ *   for `ControlPointsLegacy`) or intensity value (for `ControlPoints`),
+ *   depending on on which field is being parsed.
+ * - Opacity is a float in the [0, 1] range.
+ * - The hex color is a 6-digit hex color (e.g. `ffeecc`), and can be replaced
+ *   with `1` to represent white (`ffffff`).
  */
 export var CONTROL_POINTS_REGEX = new RegExp("^".concat(CONTROL_POINT_REGEX.source, "(:").concat(CONTROL_POINT_REGEX.source, ")*$"));
 
@@ -122,12 +123,15 @@ export var ViewerChannelSettingKeys = /*#__PURE__*/function (ViewerChannelSettin
   ViewerChannelSettingKeys["ColorizeAlpha"] = "cza";
   ViewerChannelSettingKeys["IsosurfaceAlpha"] = "isa";
   ViewerChannelSettingKeys["Lut"] = "lut";
-  ViewerChannelSettingKeys["Ramp"] = "rmp";
-  ViewerChannelSettingKeys["ControlPoints"] = "cps";
+  ViewerChannelSettingKeys["ControlPoints"] = "cpt";
+  ViewerChannelSettingKeys["ControlPointsLegacy"] = "cps";
+  ViewerChannelSettingKeys["Ramp"] = "ram";
+  ViewerChannelSettingKeys["RampLegacy"] = "rmp";
   ViewerChannelSettingKeys["ControlPointsEnabled"] = "cpe";
   ViewerChannelSettingKeys["VolumeEnabled"] = "ven";
   ViewerChannelSettingKeys["SurfaceEnabled"] = "sen";
   ViewerChannelSettingKeys["IsosurfaceValue"] = "isv";
+  ViewerChannelSettingKeys["KeepRange"] = "pin";
   return ViewerChannelSettingKeys;
 }({});
 
@@ -139,12 +143,15 @@ _ViewerChannelSetting2 = ViewerChannelSettingKeys.Colorize;
 _ViewerChannelSetting3 = ViewerChannelSettingKeys.ColorizeAlpha;
 _ViewerChannelSetting4 = ViewerChannelSettingKeys.IsosurfaceAlpha;
 _ViewerChannelSetting5 = ViewerChannelSettingKeys.Lut;
-_ViewerChannelSetting6 = ViewerChannelSettingKeys.ControlPoints;
-_ViewerChannelSetting7 = ViewerChannelSettingKeys.ControlPointsEnabled;
-_ViewerChannelSetting8 = ViewerChannelSettingKeys.Ramp;
-_ViewerChannelSetting9 = ViewerChannelSettingKeys.VolumeEnabled;
-_ViewerChannelSetting10 = ViewerChannelSettingKeys.SurfaceEnabled;
-_ViewerChannelSetting11 = ViewerChannelSettingKeys.IsosurfaceValue;
+_ViewerChannelSetting6 = ViewerChannelSettingKeys.ControlPointsLegacy;
+_ViewerChannelSetting7 = ViewerChannelSettingKeys.ControlPoints;
+_ViewerChannelSetting8 = ViewerChannelSettingKeys.ControlPointsEnabled;
+_ViewerChannelSetting9 = ViewerChannelSettingKeys.RampLegacy;
+_ViewerChannelSetting10 = ViewerChannelSettingKeys.Ramp;
+_ViewerChannelSetting11 = ViewerChannelSettingKeys.VolumeEnabled;
+_ViewerChannelSetting12 = ViewerChannelSettingKeys.SurfaceEnabled;
+_ViewerChannelSetting13 = ViewerChannelSettingKeys.IsosurfaceValue;
+_ViewerChannelSetting14 = ViewerChannelSettingKeys.KeepRange;
 export var ViewerChannelSettingParams = /*#__PURE__*/_createClass(function ViewerChannelSettingParams() {
   _classCallCheck(this, ViewerChannelSettingParams);
   /** Color, as a 6-digit hex color.  */
@@ -183,30 +190,53 @@ export var ViewerChannelSettingParams = /*#__PURE__*/_createClass(function Viewe
    */
   _defineProperty(this, _ViewerChannelSetting5, undefined);
   /**
-   * Control points for the transfer function. If provided, overrides the
-   * `lut` field when calculating the control points. Should be a list
-   * of `x:opacity:color` triplets, separated by colon.
-   * - `x` is a numeric intensity value.
+   * Legacy specifier for control points for the transfer function as a list of
+   * `x:opacity:color` triplets, separated by colon. Uses histogram bin indices
+   * instead of intensity values.
+   * - `x` is a histogram bin index in the [0, 255] range.
    * - `opacity` is a float in the [0, 1] range.
    * - `color` is a 6-digit hex color, e.g. `ff0000`.
+   *
+   * Will be overridden by the ControlPoints field (`cpt`) if provided.
    */
   _defineProperty(this, _ViewerChannelSetting6, undefined);
   /**
-   * Whether to show advanced mode, which will show control points instead of
-   * ramp values defined by the LUT. "1" is enabled, disabled by default.
+   * Control points for the transfer function, formatted as a list of
+   * `x:opacity:color` triplets, separated by colons.
+   * - `x` is a numeric intensity value.
+   * - `opacity` is a float in the [0, 1] range.
+   * - `color` is a 6-digit hex color, e.g. `ff0000`.
+   *
+   * If provided, overrides the `lut` field when calculating the control points.
    */
   _defineProperty(this, _ViewerChannelSetting7, undefined);
   /**
-   * Raw ramp values, which should be two numeric values separated by a colon.
-   * If provided, overrides the `lut` field when calculating the ramp values.
+   * Whether to show advanced mode, which will show control points instead of
+   * ramp values defined by the LUT. "1" is enabled, disabled by default.
    */
   _defineProperty(this, _ViewerChannelSetting8, undefined);
-  /** Volume enabled. "1" is enabled. Disabled by default. */
+  /**
+   * Legacy specifier for the transfer function ramp which uses histogram bin
+   * indices instead of intensity values, formatted as `min:max`. Will be
+   * overridden by the Ramp field (`ram`) if provided.
+   */
   _defineProperty(this, _ViewerChannelSetting9, undefined);
-  /** Isosurface enabled. "1" is enabled. Disabled by default. */
+  /**
+   * Ramp min and max intensity values (`min:max`). If provided, overrides the
+   * `lut` field when calculating the ramp.
+   */
   _defineProperty(this, _ViewerChannelSetting10, undefined);
-  /** Isosurface value, in the [0, 255] range. Set to `128` by default. */
+  /** Volume enabled. "1" is enabled. Disabled by default. */
   _defineProperty(this, _ViewerChannelSetting11, undefined);
+  /** Isosurface enabled. "1" is enabled. Disabled by default. */
+  _defineProperty(this, _ViewerChannelSetting12, undefined);
+  /** Isosurface value, in the [0, 255] range. Set to `128` by default. */
+  _defineProperty(this, _ViewerChannelSetting13, undefined);
+  /**
+   * Whether to keep the current contrast settings when loading a new volume.
+   * "1" is enabled. Disabled by default.
+   */
+  _defineProperty(this, _ViewerChannelSetting14, undefined);
 });
 /**
  * Channels, matching the pattern `c0`, `c1`, etc. corresponding to the index of the channel being configured.
@@ -298,8 +328,15 @@ export var ViewerStateParams = /*#__PURE__*/_createClass(function ViewerStatePar
 var DataParams = /*#__PURE__*/_createClass(function DataParams() {
   _classCallCheck(this, DataParams);
   /**
-   * One or more volume URLs to load. If multiple URLs are provided, they should
-   * be separated by commas.
+   * One or more volume URLs to load.
+   *
+   * This parameter may represent a single image with multiple data sources by delimiting each source URL with `,`.
+   * It may also represent multiple scenes by delimiting each scene URL (and/or each collection of multiple
+   * `,`-delimited source URLs) with `+`. E.g. `url1+url2,url3` represents a collection of two scenes, where the first
+   * scene comes from `url1` and the second is a combination of the channels from the images at `url2` and `url3`.
+   *
+   * When parsing, we do our best to account for `%`-encoding, including the possibility that each source/scene URL was
+   * encoded separately, then concatenated with the proper delimiters, then encoded again.
    */
   _defineProperty(this, "url", undefined);
   /**
@@ -310,14 +347,24 @@ var DataParams = /*#__PURE__*/_createClass(function DataParams() {
    * See `ManifestJson` for the type definition.
    */
   _defineProperty(this, "manifest", undefined);
-  /**
-   * The name of a dataset in the Cell Feature Explorer database. Used with `id`.
-   */
+  /** The name of a dataset in the Cell Feature Explorer database. Used with `id`. */
   _defineProperty(this, "dataset", undefined);
+  /** The ID of a cell within the loaded dataset. Used with `dataset`. */
+  _defineProperty(this, "id", undefined);
+  /** The key of a collection of scenes stored in local storage. Overrides `url`. */
+  _defineProperty(this, "collectionid", undefined);
   /**
-   * The ID of a cell within the loaded dataset. Used with `dataset`.
+   * The origin of an opening window that wants to send a message to this window.
+   *
+   * The presence of this param implies that this window has just been opened by another app, and the opening app has
+   * more data to send. Until that message is received, we fall back to `url`. Once that message arrives, the scenes to
+   * open are written to local storage at a new `collectionid` and `msgorigin` is removed, allowing the window to
+   * switch to reading local storage.
+   *
+   * All this happens independently of URL parsing, so the only meaningful thing this parsing code does with this param
+   * is check whether it is present.
    */
-  _defineProperty(this, "id", undefined);
+  _defineProperty(this, "msgorigin", undefined);
 });
 var DeprecatedParams = /*#__PURE__*/_createClass(function DeprecatedParams() {
   _classCallCheck(this, DeprecatedParams);
@@ -328,6 +375,10 @@ var DeprecatedParams = /*#__PURE__*/_createClass(function DeprecatedParams() {
   /** Deprecated query parameter for channel colors. */
   _defineProperty(this, "colors", undefined);
 });
+/**
+ * A message sent from an external application after this app was opened,
+ * containing data that was too large to pack into the URL.
+ */
 var allowedParamKeys = [].concat(_toConsumableArray(Object.keys(new ViewerStateParams())), _toConsumableArray(Object.keys(new DataParams())), _toConsumableArray(Object.keys(new DeprecatedParams())));
 var isParamKey = function isParamKey(key) {
   return allowedParamKeys.indexOf(key) !== -1;
@@ -362,39 +413,63 @@ export function getAllowedParams(searchParams) {
   }
   return result;
 }
-var decodeURL = function decodeURL(url) {
-  var decodedUrl = decodeURIComponent(url);
-  return decodedUrl.endsWith("/") ? decodedUrl.slice(0, -1) : decodedUrl;
-};
 
-/** Try to parse a `string` as a list of 2 or more URLs. Returns `undefined` if the string is not a valid URL list. */
-var tryDecodeURLList = function tryDecodeURLList(url) {
-  var delim = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ",";
-  if (typeof delim === "string" ? !url.includes(delim) : !delim.test(url)) {
-    return undefined;
-  }
-  var urls = url.split(delim).map(function (u) {
-    return decodeURL(u);
+/** Tries to retrieve the given `param` from a `search` string without using `URLSearchParams`, to avoid decoding. */
+var getSearchParamRaw = function getSearchParamRaw(search, param) {
+  var trimmedSearch = search.startsWith("?") ? search.slice(1) : search;
+  var entries = trimmedSearch.split("&");
+  var key = param + "=";
+  var foundKeyValue = entries.find(function (keyValue) {
+    return keyValue.startsWith(key);
   });
+  return foundKeyValue === null || foundKeyValue === void 0 ? void 0 : foundKeyValue.slice(key.length);
+};
 
-  // Verify that all urls are valid
-  var _iterator2 = _createForOfIteratorHelper(urls),
-    _step2;
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var u = _step2.value;
-      try {
-        new URL(u);
-      } catch (_e) {
-        return undefined;
+/**
+ * Applies `decodeURIComponent` over and over until `url` either seems to be a valid `URL` or satisfies `condition`.
+ */
+var decodeURLUntilParseable = function decodeURLUntilParseable(url) {
+  var condition = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (_url) {
+    return false;
+  };
+  var decoded = url;
+  while (!condition(decoded) && !URL.canParse(decoded)) {
+    try {
+      var nextDecoded = decodeURIComponent(decoded);
+      if (nextDecoded === decoded) {
+        return decoded;
       }
+      decoded = nextDecoded;
+    } catch (_unused) {
+      return decoded;
     }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
   }
-  return urls;
+  return decoded;
+};
+
+/** Parses the `url` query param into a 2D URL array: one or more scenes, with one or more sources per scene. */
+export var parseImageURLParam = function parseImageURLParam(urlParam) {
+  // Decode until either any valid delimiters appear or `urlParam` is parseable as a single URL.
+  var decodedScenes = decodeURLUntilParseable(urlParam, function (url) {
+    return /[+ ,]/.test(url);
+  });
+  // Split into scene URLs.
+  var sceneUrls = decodedScenes.split(/[+ ]/);
+  return sceneUrls.map(function (scene) {
+    // Split each scene into multiple sources, if any.
+    var decodedSources = decodeURLUntilParseable(scene, function (url) {
+      return url.includes(",");
+    });
+    var sourceUrls = decodedSources.split(",");
+    if (sourceUrls.length === 1) {
+      return sourceUrls;
+    }
+
+    // Try to make sure the source URLs are decoded as well.
+    return sourceUrls.map(function (source) {
+      return decodeURLUntilParseable(source);
+    });
+  });
 };
 
 //// DATA PARSING //////////////////////
@@ -415,20 +490,20 @@ export function parseKeyValueList(data) {
   }
   var result = {};
   var keyValuePairs = data.split(",");
-  var _iterator3 = _createForOfIteratorHelper(keyValuePairs),
-    _step3;
+  var _iterator2 = _createForOfIteratorHelper(keyValuePairs),
+    _step2;
   try {
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var pair = _step3.value;
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var pair = _step2.value;
       var splitIndex = pair.indexOf(":");
       var key = pair.slice(0, splitIndex);
       var value = pair.slice(splitIndex + 1);
       result[decodeURIComponent(key).trim()] = decodeURIComponent(value).trim();
     }
   } catch (err) {
-    _iterator3.e(err);
+    _iterator2.e(err);
   } finally {
-    _iterator3.f();
+    _iterator2.f();
   }
   return result;
 }
@@ -723,22 +798,22 @@ function parseControlPoints(controlPoints) {
   }
 
   // Parse raw control point data from the string into an array of [x, opacity, color] triplets.
-  var rawControlPointData;
+  var controlPointStrings;
   if (LEGACY_CONTROL_POINTS_REGEX.test(controlPoints)) {
     // Legacy format uses commas to separate control points.
-    rawControlPointData = controlPoints.split(",").map(function (cp) {
+    controlPointStrings = controlPoints.split(",").map(function (cp) {
       return cp.split(":");
     });
   } else {
     // New format is all colon-separated, where every three elements represent a control point.
-    rawControlPointData = controlPoints.split(":").reduce(function (acc, _val, i, array) {
+    controlPointStrings = controlPoints.split(":").reduce(function (acc, _val, i, array) {
       if ((i + 1) % 3 === 0) {
         acc.push([array[i - 2], array[i - 1], array[i]]);
       }
       return acc;
     }, []);
   }
-  var newControlPoints = rawControlPointData.map(function (cp) {
+  var newControlPoints = controlPointStrings.map(function (cp) {
     var _parseStringFloat, _parseStringFloat2, _parseHexColorAsColor;
     var _cp = _slicedToArray(cp, 3),
       x = _cp[0],
@@ -770,7 +845,8 @@ export function deserializeViewerChannelSetting(channelIndex, jsonState) {
     match: channelIndex,
     enabled: parseStringBoolean(jsonState[ViewerChannelSettingKeys.VolumeEnabled]),
     surfaceEnabled: parseStringBoolean(jsonState[ViewerChannelSettingKeys.SurfaceEnabled]),
-    isovalue: parseStringFloat(jsonState[ViewerChannelSettingKeys.IsosurfaceValue], 0, 255),
+    isovalue: parseStringFloat(jsonState[ViewerChannelSettingKeys.IsosurfaceValue], -Infinity, Infinity),
+    keepIntensityRange: parseStringBoolean(jsonState[ViewerChannelSettingKeys.KeepRange]),
     surfaceOpacity: parseStringFloat(jsonState[ViewerChannelSettingKeys.IsosurfaceAlpha], 0, 1),
     colorizeEnabled: parseStringBoolean(jsonState[ViewerChannelSettingKeys.Colorize]),
     colorizeAlpha: parseStringFloat(jsonState[ViewerChannelSettingKeys.ColorizeAlpha], 0, 1),
@@ -784,17 +860,41 @@ export function deserializeViewerChannelSetting(channelIndex, jsonState) {
       _jsonState$ViewerChan2 = _slicedToArray(_jsonState$ViewerChan, 2),
       min = _jsonState$ViewerChan2[0],
       max = _jsonState$ViewerChan2[1];
-    result.lut = [min.trim(), max.trim()];
+    result.intensity = _objectSpread(_objectSpread({}, result.intensity), {}, {
+      lut: [min.trim(), max.trim()]
+    });
   }
-  if (jsonState[ViewerChannelSettingKeys.Ramp] && RAMP_REGEX.test(jsonState.rmp)) {
-    var _jsonState$ViewerChan3 = jsonState[ViewerChannelSettingKeys.Ramp].split(":"),
-      _jsonState$ViewerChan4 = _slicedToArray(_jsonState$ViewerChan3, 2),
-      _min = _jsonState$ViewerChan4[0],
-      _max = _jsonState$ViewerChan4[1];
-    result.ramp = [Number.parseFloat(_min), Number.parseFloat(_max)];
+  if (jsonState[ViewerChannelSettingKeys.Ramp]) {
+    if (RAMP_REGEX.test(jsonState[ViewerChannelSettingKeys.Ramp])) {
+      var _jsonState$ViewerChan3 = jsonState[ViewerChannelSettingKeys.Ramp].split(":"),
+        _jsonState$ViewerChan4 = _slicedToArray(_jsonState$ViewerChan3, 2),
+        _min = _jsonState$ViewerChan4[0],
+        _max = _jsonState$ViewerChan4[1];
+      result.intensity = _objectSpread(_objectSpread({}, result.intensity), {}, {
+        ramp: [Number.parseFloat(_min), Number.parseFloat(_max)]
+      });
+    }
+  } else if (jsonState[ViewerChannelSettingKeys.RampLegacy]) {
+    if (RAMP_REGEX.test(jsonState[ViewerChannelSettingKeys.RampLegacy])) {
+      var _jsonState$ViewerChan5 = jsonState[ViewerChannelSettingKeys.RampLegacy].split(":"),
+        _jsonState$ViewerChan6 = _slicedToArray(_jsonState$ViewerChan5, 2),
+        _min2 = _jsonState$ViewerChan6[0],
+        _max2 = _jsonState$ViewerChan6[1];
+      result.ramp = [Number.parseFloat(_min2), Number.parseFloat(_max2)];
+    }
   }
   if (jsonState[ViewerChannelSettingKeys.ControlPoints]) {
-    result.controlPoints = parseControlPoints(jsonState[ViewerChannelSettingKeys.ControlPoints]);
+    var parsedResult = parseControlPoints(jsonState[ViewerChannelSettingKeys.ControlPoints]);
+    if (parsedResult) {
+      result.intensity = _objectSpread(_objectSpread({}, result.intensity), {}, {
+        controlPoints: parsedResult
+      });
+    }
+  } else if (jsonState[ViewerChannelSettingKeys.ControlPointsLegacy]) {
+    var _parsedResult = parseControlPoints(jsonState[ViewerChannelSettingKeys.ControlPointsLegacy]);
+    if (_parsedResult) {
+      result.controlPoints = _parsedResult;
+    }
   }
   return result;
 }
@@ -807,13 +907,11 @@ export function deserializeViewerChannelSetting(channelIndex, jsonState) {
  * @returns A `ViewerChannelSettingParams` object with the serialized parameters. Undefined values are removed.
  */
 export function serializeViewerChannelSetting(channelSetting, removeDefaults) {
-  var _channelSetting$isova, _channelSetting$opaci, _channelSetting$color, _channelSetting$ramp;
+  var _channelSetting$isova, _channelSetting$opaci, _channelSetting$color, _channelSetting$ramp, _removeUndefinedPrope;
   if (removeDefaults) {
     channelSetting = removeMatchingProperties(channelSetting, getDefaultChannelState());
   }
-  return removeUndefinedProperties(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ViewerChannelSettingKeys.VolumeEnabled, serializeBoolean(channelSetting.volumeEnabled)), ViewerChannelSettingKeys.SurfaceEnabled, serializeBoolean(channelSetting.isosurfaceEnabled)), ViewerChannelSettingKeys.IsosurfaceValue, (_channelSetting$isova = channelSetting.isovalue) === null || _channelSetting$isova === void 0 ? void 0 : _channelSetting$isova.toString()), ViewerChannelSettingKeys.IsosurfaceAlpha, (_channelSetting$opaci = channelSetting.opacity) === null || _channelSetting$opaci === void 0 ? void 0 : _channelSetting$opaci.toString()), ViewerChannelSettingKeys.Colorize, serializeBoolean(channelSetting.colorizeEnabled)), ViewerChannelSettingKeys.ColorizeAlpha, (_channelSetting$color = channelSetting.colorizeAlpha) === null || _channelSetting$color === void 0 ? void 0 : _channelSetting$color.toString()), ViewerChannelSettingKeys.Color, channelSetting.color && colorArrayToHex(channelSetting.color)), ViewerChannelSettingKeys.ControlPoints, channelSetting.controlPoints && serializeControlPoints(channelSetting.controlPoints)), ViewerChannelSettingKeys.ControlPointsEnabled, serializeBoolean(channelSetting.useControlPoints)), ViewerChannelSettingKeys.Ramp, (_channelSetting$ramp = channelSetting.ramp) === null || _channelSetting$ramp === void 0 ? void 0 : _channelSetting$ramp.map(function (value) {
-    return formatFloat(value);
-  }).join(":")));
+  return removeUndefinedProperties((_removeUndefinedPrope = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_removeUndefinedPrope, ViewerChannelSettingKeys.VolumeEnabled, serializeBoolean(channelSetting.volumeEnabled)), ViewerChannelSettingKeys.SurfaceEnabled, serializeBoolean(channelSetting.isosurfaceEnabled)), ViewerChannelSettingKeys.IsosurfaceValue, (_channelSetting$isova = channelSetting.isovalue) === null || _channelSetting$isova === void 0 ? void 0 : _channelSetting$isova.toString()), ViewerChannelSettingKeys.IsosurfaceAlpha, (_channelSetting$opaci = channelSetting.opacity) === null || _channelSetting$opaci === void 0 ? void 0 : _channelSetting$opaci.toString()), ViewerChannelSettingKeys.Colorize, serializeBoolean(channelSetting.colorizeEnabled)), ViewerChannelSettingKeys.ColorizeAlpha, (_channelSetting$color = channelSetting.colorizeAlpha) === null || _channelSetting$color === void 0 ? void 0 : _channelSetting$color.toString()), ViewerChannelSettingKeys.Color, channelSetting.color && colorArrayToHex(channelSetting.color)), ViewerChannelSettingKeys.ControlPoints, channelSetting.controlPoints && serializeControlPoints(channelSetting.controlPoints)), ViewerChannelSettingKeys.ControlPointsEnabled, serializeBoolean(channelSetting.useControlPoints)), ViewerChannelSettingKeys.Ramp, (_channelSetting$ramp = channelSetting.ramp) === null || _channelSetting$ramp === void 0 ? void 0 : _channelSetting$ramp.join(":")), _defineProperty(_removeUndefinedPrope, ViewerChannelSettingKeys.KeepRange, serializeBoolean(channelSetting.keepIntensityRange))));
 }
 export function deserializeViewerState(params) {
   var result = {
@@ -957,7 +1055,7 @@ function loadDataset(_x, _x2, _x3) {
 }
 function _loadDataset() {
   _loadDataset = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(firestore, dataset, id) {
-    var db, args, datasets, datasetMeta, _iterator4, _step4, d, innerDatasets, names, matchingName, datasetData, baseUrl, fileInfo;
+    var db, args, datasets, datasetMeta, _iterator3, _step3, d, innerDatasets, names, matchingName, datasetData, baseUrl, fileInfo;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -968,15 +1066,15 @@ function _loadDataset() {
         case 4:
           datasets = _context.sent;
           datasetMeta = undefined;
-          _iterator4 = _createForOfIteratorHelper(datasets);
+          _iterator3 = _createForOfIteratorHelper(datasets);
           _context.prev = 7;
-          _iterator4.s();
+          _iterator3.s();
         case 9:
-          if ((_step4 = _iterator4.n()).done) {
+          if ((_step3 = _iterator3.n()).done) {
             _context.next = 19;
             break;
           }
-          d = _step4.value;
+          d = _step3.value;
           innerDatasets = d.datasets;
           names = Object.keys(innerDatasets);
           matchingName = names.find(function (name) {
@@ -997,10 +1095,10 @@ function _loadDataset() {
         case 21:
           _context.prev = 21;
           _context.t0 = _context["catch"](7);
-          _iterator4.e(_context.t0);
+          _iterator3.e(_context.t0);
         case 24:
           _context.prev = 24;
-          _iterator4.f();
+          _iterator3.f();
           return _context.finish(24);
         case 27:
           if (!(datasetMeta === undefined)) {
@@ -1048,16 +1146,14 @@ export function loadFromManifest(_x4) {
 
 /**
  * Parses a set of URL search parameters into props for the viewer.
- * @param urlSearchParams The URLSearchParams object to parse.
- * @param firestore Optional Firestore instance. If provided, the function can
- * load data from a Firestore dataset if the `dataset` and `id` parameters are
- * provided.
+ * @param search The query string to parse, which must be valid in the `URLSearchParams constructor
+ * @param firestore Optional Firestore instance. If provided, the function can load data from a
+ * Firestore dataset if the `dataset` and `id` parameters are provided.
  * @returns An object containing:
  * - `args`: Partial AppProps object.
  * - `viewerSettings`: Partial ViewerState object.
  *
- * `args` can be passed as props to the `ImageViewerApp`, and `viewerSettings`
- * can be passed to `ViewerStateProvider`.
+ * `args` can be passed as props to the `ImageViewerApp`, and `viewerSettings` can be passed to `ViewerStateProvider`.
  */
 function _loadFromManifest() {
   _loadFromManifest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(manifestUrl) {
@@ -1134,19 +1230,15 @@ export function parseViewerUrlParams(_x5, _x6) {
   return _parseViewerUrlParams.apply(this, arguments);
 }
 
-/**
- * Serializes the ViewerState and ChannelState of a ViewerStateContext into a URLSearchParams object.
- * @param state ViewerStateContext to serialize.
- * @param removeDefaults If true, shortens parameters by removing any properties that match the default state.
- * This includes the output of GET_DEFAULT_VIEWER_STATE and GET_DEFAULT_CHANNEL_STATE.
- */
+/** Adds the data in a newly-arrived `ViewerMessage` to an existing stored `AppProps` instance. */
 function _parseViewerUrlParams() {
-  _parseViewerUrlParams = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(urlSearchParams, firestore) {
-    var params, args, viewerSettings, deprecatedChannelSettings, channelSettings, scenes, _yield$loadFromManife, manifestScenes, manifestMetadata, _localStorage$getItem, _tryDecodeURLList, getFromStorage, urlParam, sceneUrls, metadataJson, firstScene, firstUrl, imageUrls, datasetArgs;
+  _parseViewerUrlParams = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(search, firestore) {
+    var searchParams, params, args, viewerSettings, deprecatedChannelSettings, channelSettings, scenes, _yield$loadFromManife, manifestScenes, manifestMetadata, collectionid, msgorigin, getFromStorage, urlParamFromStorage, urlParam, firstScene, firstUrl, imageUrls, datasetArgs;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          params = getAllowedParams(urlSearchParams);
+          searchParams = new URLSearchParams(search);
+          params = getAllowedParams(searchParams);
           args = {}; // Parse viewer state
           viewerSettings = deserializeViewerState(params); // Parse channel settings. If per-channel settings are provided, they will override
           // the old `ch` query parameter.
@@ -1155,38 +1247,33 @@ function _parseViewerUrlParams() {
           args.viewerChannelSettings = channelSettings !== null && channelSettings !== void 0 ? channelSettings : deprecatedChannelSettings;
 
           // Parse data sources (URL or dataset/id pair)
-          if (!(params.manifest !== undefined || params.url !== undefined)) {
-            _context3.next = 33;
+          if (!(params.manifest !== undefined || params.url !== undefined || params.collectionid !== undefined)) {
+            _context3.next = 35;
             break;
           }
           if (!params.manifest) {
-            _context3.next = 17;
+            _context3.next = 18;
             break;
           }
-          _context3.next = 10;
+          _context3.next = 11;
           return loadFromManifest(params.manifest);
-        case 10:
+        case 11:
           _yield$loadFromManife = _context3.sent;
           manifestScenes = _yield$loadFromManife.scenes;
           manifestMetadata = _yield$loadFromManife.metadata;
           scenes = manifestScenes;
           args.metadata = manifestMetadata !== null && manifestMetadata !== void 0 ? manifestMetadata : undefined;
-          _context3.next = 22;
+          _context3.next = 24;
           break;
-        case 17:
-          // Load from URL
-          getFromStorage = params.url === URL_FETCH_FROM_STORAGE;
-          urlParam = getFromStorage ? (_localStorage$getItem = localStorage.getItem("url")) !== null && _localStorage$getItem !== void 0 ? _localStorage$getItem : params.url : params.url; // split encoded url into a list of one or more scenes...
-          sceneUrls = (_tryDecodeURLList = tryDecodeURLList(urlParam, /[+ ]/)) !== null && _tryDecodeURLList !== void 0 ? _tryDecodeURLList : [urlParam]; // ...and each scene into a list of multiple sources, if any.
-          scenes = sceneUrls.map(function (scene) {
-            var _tryDecodeURLList2;
-            return (_tryDecodeURLList2 = tryDecodeURLList(scene)) !== null && _tryDecodeURLList2 !== void 0 ? _tryDecodeURLList2 : decodeURL(scene);
-          });
-          if (getFromStorage) {
-            metadataJson = localStorage.getItem("meta");
-            args.metadata = metadataJson !== null ? JSON.parse(metadataJson) : undefined;
-          }
-        case 22:
+        case 18:
+          // Load from URL or storage
+          collectionid = params.collectionid, msgorigin = params.msgorigin;
+          getFromStorage = collectionid !== undefined && msgorigin === undefined;
+          urlParamFromStorage = getFromStorage ? readStoredScenes(collectionid) : undefined;
+          urlParam = urlParamFromStorage !== null && urlParamFromStorage !== void 0 ? urlParamFromStorage : getSearchParamRaw(search, "url");
+          scenes = parseImageURLParam(urlParam);
+          args.metadata = readStoredMetadata(scenes);
+        case 24:
           firstScene = scenes[0]; // Get the very first URL for the download button
           firstUrl = Array.isArray(firstScene) ? firstScene[0] : firstScene; // If there's only one url, just pass that
           imageUrls = scenes.length > 1 || firstScene.length > 1 ? {
@@ -1217,24 +1304,24 @@ function _parseViewerUrlParams() {
               }]
             };
           }
-          _context3.next = 38;
+          _context3.next = 40;
           break;
-        case 33:
+        case 35:
           if (!(params.dataset && params.id && firestore)) {
-            _context3.next = 38;
+            _context3.next = 40;
             break;
           }
-          _context3.next = 36;
+          _context3.next = 38;
           return loadDataset(firestore, params.dataset, params.id);
-        case 36:
+        case 38:
           datasetArgs = _context3.sent;
           args = _objectSpread(_objectSpread({}, args), datasetArgs);
-        case 38:
+        case 40:
           return _context3.abrupt("return", {
             args: removeUndefinedProperties(args),
             viewerSettings: removeUndefinedProperties(viewerSettings)
           });
-        case 39:
+        case 41:
         case "end":
           return _context3.stop();
       }
@@ -1242,6 +1329,44 @@ function _parseViewerUrlParams() {
   }));
   return _parseViewerUrlParams.apply(this, arguments);
 }
+export function addViewerParamsFromMessage(args, message) {
+  var _message$scenes;
+  // get scenes
+  var imageUrl = args.imageUrl;
+  var scenes = (_message$scenes = message.scenes) !== null && _message$scenes !== void 0 ? _message$scenes : typeof imageUrl === "string" ? [imageUrl] : imageUrl.scenes;
+  var firstScene = scenes[0];
+  var newImageUrl = scenes.length === 1 && typeof firstScene === "string" ? firstScene : {
+    scenes: scenes
+  };
+
+  // get metadata
+  var meta = message.meta;
+  var messageMeta = meta && scenes.map(function (scene) {
+    if (Array.isArray(scene)) {
+      // can't handle multi-source scenes (yet)
+      return undefined;
+    }
+    return meta[scene];
+  });
+  var newMetadata = messageMeta !== null && messageMeta !== void 0 ? messageMeta : args.metadata;
+  if (newMetadata === undefined) {
+    return _objectSpread(_objectSpread({}, args), {}, {
+      imageUrl: newImageUrl
+    });
+  } else {
+    return _objectSpread(_objectSpread({}, args), {}, {
+      imageUrl: newImageUrl,
+      metadata: newMetadata
+    });
+  }
+}
+
+/**
+ * Serializes the ViewerState and ChannelState of a ViewerStateContext into a URLSearchParams object.
+ * @param state ViewerStateContext to serialize.
+ * @param removeDefaults If true, shortens parameters by removing any properties that match the default state.
+ * This includes the output of GET_DEFAULT_VIEWER_STATE and GET_DEFAULT_CHANNEL_STATE.
+ */
 export function serializeViewerUrlParams(state) {
   var _state$channelSetting;
   var removeDefaults = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;