From 99aa0398ad52a1c9f62dda305b77bd8e290162a0 Mon Sep 17 00:00:00 2001
From: ST John <st--@users.noreply.github.com>
Date: Fri, 9 Apr 2021 23:53:13 +0100
Subject: [PATCH 01/24] WIP: 2d covariance matrix plot (requires d3-contour,
 d3-geo)

---
 package-lock.json     | 43 ++++++++++++++++++++
 package.json          |  4 ++
 src/App.svelte        |  6 ++-
 src/KernelTwoD.svelte | 91 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 143 insertions(+), 1 deletion(-)
 create mode 100644 src/KernelTwoD.svelte

diff --git a/package-lock.json b/package-lock.json
index 2365e5f..748a93b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -105,6 +105,25 @@
       "integrity": "sha512-sdBMGfNvLUkBypPMEhOcKcblTQfgHbqbYrUqRE31jOwdDHBJBxz4co2MDAq93S4Cp++phk4UiwoEg/1hK3xXAQ==",
       "dev": true
     },
+    "@types/d3-contour": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-2.0.0.tgz",
+      "integrity": "sha512-PS9UO6zBQqwHXsocbpdzZFONgK1oRUgWtjjh/iz2vM06KaXLInLiKZ9e3OLBRerc1cU2uJYpO+8zOnb6frvCGQ==",
+      "dev": true,
+      "requires": {
+        "@types/d3-array": "*",
+        "@types/geojson": "*"
+      }
+    },
+    "@types/d3-geo": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-2.0.0.tgz",
+      "integrity": "sha512-DHHgYXW36lnAEQMYU2udKVOxxljHrn2EdOINeSC9jWCAXwOnGn7A19B8sNsHqgpu4F7O2bSD7//cqBXD3W0Deg==",
+      "dev": true,
+      "requires": {
+        "@types/geojson": "*"
+      }
+    },
     "@types/d3-random": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-2.2.0.tgz",
@@ -138,6 +157,12 @@
       "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
       "dev": true
     },
+    "@types/geojson": {
+      "version": "7946.0.7",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz",
+      "integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==",
+      "dev": true
+    },
     "@types/node": {
       "version": "14.14.37",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz",
@@ -316,12 +341,30 @@
       "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==",
       "dev": true
     },
+    "d3-contour": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-2.0.0.tgz",
+      "integrity": "sha512-9unAtvIaNk06UwqBmvsdHX7CZ+NPDZnn8TtNH1myW93pWJkhsV25JcgnYAu0Ck5Veb1DHiCv++Ic5uvJ+h50JA==",
+      "dev": true,
+      "requires": {
+        "d3-array": "2"
+      }
+    },
     "d3-format": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz",
       "integrity": "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==",
       "dev": true
     },
+    "d3-geo": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.1.tgz",
+      "integrity": "sha512-M6yzGbFRfxzNrVhxDJXzJqSLQ90q1cCyb3EWFZ1LF4eWOBYxFypw7I/NFVBNXKNqxv1bqLathhYvdJ6DC+th3A==",
+      "dev": true,
+      "requires": {
+        "d3-array": ">=2.5"
+      }
+    },
     "d3-interpolate": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz",
diff --git a/package.json b/package.json
index f09ce39..54a85c9 100644
--- a/package.json
+++ b/package.json
@@ -14,10 +14,14 @@
     "@rollup/plugin-typescript": "^8.0.0",
     "@tsconfig/svelte": "^1.0.0",
     "@types/d3-array": "^2.9.0",
+    "@types/d3-contour": "^2.0.0",
+    "@types/d3-geo": "^2.0.0",
     "@types/d3-random": "^2.2.0",
     "@types/d3-scale": "^3.2.2",
     "@types/d3-scale-chromatic": "^2.0.0",
     "d3-array": "latest",
+    "d3-contour": "^2.0.0",
+    "d3-geo": "^2.0.1",
     "d3-random": "^2.2.2",
     "d3-scale": "latest",
     "d3-scale-chromatic": "^2.0.0",
diff --git a/src/App.svelte b/src/App.svelte
index 2e045ba..14205c2 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -30,6 +30,7 @@ Future thoughts:
   import Kernelplot from "./Kernelplot.svelte";
   import Covariance from "./Covariance.svelte";
   import RandomSample from "./RandomSample.svelte";
+  import KernelTwoD from "./KernelTwoD.svelte";
   import { x1, x2, vs } from "./store.js";
   import { sqexp, matern12, white, sumKernel } from "./kernels.js";
   import { linspace, matrixSqrt, sampleMvn, covEllipse } from "./mymath.js";
@@ -132,6 +133,9 @@ Future thoughts:
     <div class="squarechart" style="grid-area: covariance;">
       <Covariance {atX1} {atX2} {covProps} />
     </div>
+    <div class="squarechart" style="grid-area: kernel2d;">
+      <KernelTwoD {covMat} />
+    </div>
   </div>
   <RandomSample xsLength={xs.length} />
   <button
@@ -166,7 +170,7 @@ Future thoughts:
     grid-template-rows: 30% 70%;
     grid-template-columns: 70% 30%;
     grid-template-areas:
-      "kernel ."
+      "kernel kernel2d"
       "line covariance";
   }
   .chart {
diff --git a/src/KernelTwoD.svelte b/src/KernelTwoD.svelte
new file mode 100644
index 0000000..e9756e4
--- /dev/null
+++ b/src/KernelTwoD.svelte
@@ -0,0 +1,91 @@
+<!-- Copyright (c) 2021 ST John -->
+<script>
+  import { onMount } from "svelte";
+  import { scaleLinear, scaleSequential } from "d3-scale";
+  import { interpolateSpectral } from "d3-scale-chromatic";
+  import { contours } from "d3-contour";
+  import { geoPath, geoIdentity } from "d3-geo";
+  import { x1, x2 } from "./store.js";
+  import { linspace } from "./mymath.js";
+  import { getSVGpoint } from "./getsvgpoint.js";
+  import Axes from "./Axes.svelte";
+  export let covMat;
+
+  let svg;
+  let width = 300;
+  let height = 300;
+
+  const padding = { top: 25, right: 40, bottom: 40, left: 25 };
+
+  $: xTicks = height > 180 ? linspace(0, 40, 5) : linspace(0, 40, 3);
+  $: yTicks = xTicks;
+
+  // TODO: fix aspect ratio to be square!
+  $: xScale = scaleLinear()
+    .domain([minX, maxX])
+    .range([padding.left, width - padding.right]);
+
+  $: yScale = scaleLinear()
+    .domain([minX, maxX])
+    .range([height - padding.bottom, padding.top]);
+
+  $: minX = Math.min.apply(null, xTicks);
+  $: maxX = Math.max.apply(null, xTicks);
+
+  $: contourGenerator = contours().size([covMat.rows, covMat.columns]);
+  $: flatCov = covMat.transpose().to1DArray();
+  $: console.log(flatCov);
+  $: contourGeo = linspace(-1, 1, 10).map((threshold) =>
+    contourGenerator.contour(flatCov, threshold)
+  );
+  $: contourPaths = contourGeo.map(geoPath(geoIdentity().scale(5)));
+  $: console.log(contourPaths);
+
+  $: color = scaleSequential([10, 0], interpolateSpectral);
+  onMount(resize);
+
+  function resize() {
+    ({ width, height } = svg.getBoundingClientRect());
+  }
+  function handleMousemove(event) {
+    const pt = getSVGpoint(svg, event);
+    const newX = xScale.invert(pt.x);
+    const newY = yScale.invert(pt.y);
+    x1.set(newX);
+    x2.set(newY);
+  }
+</script>
+
+<svelte:window on:resize={resize} />
+
+<svg bind:this={svg} on:mousemove={handleMousemove}>
+  <Axes {xScale} {yScale} {xTicks} {yTicks} {width} {height} {padding} />
+  {#each contourPaths as contourPath, i}
+    <path d={contourPath} style="fill: {color(i)};" />
+  {/each}
+</svg>
+
+<style>
+  svg {
+    width: 100%;
+    height: 100%;
+  }
+
+  circle {
+    fill: orange;
+    fill-opacity: 0.6;
+    stroke: rgba(0, 0, 0, 0.5);
+  }
+
+  .path-line {
+    fill: none;
+    stroke: rgb(0, 100, 100);
+    stroke-linejoin: round;
+    stroke-linecap: round;
+    stroke-width: 2;
+  }
+
+  .path-area {
+    fill: rgba(0, 100, 100, 0.2);
+  }
+</style>

From 7b07f4d9f195710925562ac3600b9e193572c6b3 Mon Sep 17 00:00:00 2001
From: ST John <st--@users.noreply.github.com>
Date: Thu, 15 Apr 2021 15:43:11 +0100
Subject: [PATCH 02/24] fix full-covariance plot

---
 src/App.svelte        | 12 ++++++--
 src/KernelTwoD.svelte | 69 +++++++++++++++++++++++++++++++++----------
 2 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 6662329..4af1dee 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -192,10 +192,13 @@ Future thoughts:
     <div class="squarechart" style="grid-area: covariance;">
       <Covariance {atX1} {atX2} {covProps} {plotProps} />
     </div>
-    <div class="squarechart" style="grid-area: kernel2d;">
+  </div>
+  <CollapsibleCard open={true}>
+    <h4 slot="header">&#187; Full covariance</h4>
+    <div slot="body" class="fullcovchart">
       <KernelTwoD {covMat} />
     </div>
-  </div>
+  </CollapsibleCard>
   <CollapsibleCard>
     <h4 slot="header">&#187; Visualization settings</h4>
     <div slot="body">
@@ -255,6 +258,11 @@ Future thoughts:
   .chart {
     background-color: #fafafa;
   }
+  .fullcovchart {
+    min-width: 400px;
+    min-height: 400px;
+    background-color: #fafafa;
+  }
   .squarechart {
     min-width: 200px;
     min-height: 200px;
diff --git a/src/KernelTwoD.svelte b/src/KernelTwoD.svelte
index e9756e4..3254fd3 100644
--- a/src/KernelTwoD.svelte
+++ b/src/KernelTwoD.svelte
@@ -15,19 +15,23 @@
   let width = 300;
   let height = 300;
 
-  const padding = { top: 25, right: 40, bottom: 40, left: 25 };
+  // const padding = { top: 25, right: 40, bottom: 40, left: 25 };
+  const padding = { top: 25, bottom: 45, left: 50 };
+  padding.right = padding.top + padding.bottom - padding.left; // 20
 
-  $: xTicks = height > 180 ? linspace(0, 40, 5) : linspace(0, 40, 3);
+  $: xTicks = size > 180 ? linspace(0, 6, 7) : linspace(0, 6, 3);
   $: yTicks = xTicks;
 
-  // TODO: fix aspect ratio to be square!
+  // fix aspect ratio to be square:
+  $: size = Math.min(width, height);
+
   $: xScale = scaleLinear()
     .domain([minX, maxX])
-    .range([padding.left, width - padding.right]);
+    .range([padding.left, size - padding.right]);
 
   $: yScale = scaleLinear()
-    .domain([minX, maxX])
-    .range([height - padding.bottom, padding.top]);
+    .domain([maxX, minX])
+    .range([size - padding.bottom, padding.top]);
 
   $: minX = Math.min.apply(null, xTicks);
   $: maxX = Math.max.apply(null, xTicks);
@@ -35,14 +39,35 @@
   $: contourGenerator = contours().size([covMat.rows, covMat.columns]);
   $: flatCov = covMat.transpose().to1DArray();
   $: console.log(flatCov);
-  $: contourGeo = linspace(-1, 1, 10).map((threshold) =>
+  let numContours = 30;
+  $: contourGeo = linspace(-1, 1, numContours).map((threshold) =>
     contourGenerator.contour(flatCov, threshold)
   );
-  $: contourPaths = contourGeo.map(geoPath(geoIdentity().scale(5)));
+
+  // https://observablehq.com/@d3/contours
+  const grid = flatCov;
+
+  // Converts from grid coordinates (indexes) to screen coordinates (pixels).
+  function mytransform({ type, value, coordinates }) {
+    return {
+      type,
+      value,
+      coordinates: coordinates.map((rings) => {
+        return rings.map((points) => {
+          return points.map(([x, y]) => [
+            xScale((x / covMat.rows) * 6 + 0),
+            yScale((y / covMat.rows) * 6 + 0),
+          ]);
+        });
+      }),
+    };
+  }
+  $: contourPaths = contourGeo.map(mytransform).map(geoPath());
   $: console.log(contourPaths);
 
-  $: color = scaleSequential([10, 0], interpolateSpectral);
+  $: color = scaleSequential([numContours, 0], interpolateSpectral);
   onMount(resize);
+  $: console.log("width", width, "height", height);
 
   function resize() {
     ({ width, height } = svg.getBoundingClientRect());
@@ -58,14 +83,28 @@
 
 <svelte:window on:resize={resize} />
 
-<svg bind:this={svg} on:mousemove={handleMousemove}>
-  <Axes {xScale} {yScale} {xTicks} {yTicks} {width} {height} {padding} />
-  {#each contourPaths as contourPath, i}
-    <path d={contourPath} style="fill: {color(i)};" />
-  {/each}
-</svg>
+<div>
+  <svg bind:this={svg} on:mousemove={handleMousemove}>
+    <Axes
+      {xScale}
+      {yScale}
+      {xTicks}
+      {yTicks}
+      width={size}
+      height={size}
+      {padding}
+    />
+    {#each contourPaths as contourPath, i}
+      <path d={contourPath} style="fill: {color(i)};" />
+    {/each}
+  </svg>
+</div>
 
 <style>
+  div {
+    width: 400px;
+    height: 400px;
+  }
   svg {
     width: 100%;
     height: 100%;

From f686152d05fd4faa3fb5eb993d3b8fa94dd4981f Mon Sep 17 00:00:00 2001
From: ST John <st--@users.noreply.github.com>
Date: Fri, 16 Apr 2021 18:43:55 +0100
Subject: [PATCH 03/24] reinstall

---
 package-lock.json | 1262 ++++++++++++---------------------------------
 1 file changed, 323 insertions(+), 939 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5b809db..ec6dac5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -46,29 +46,15 @@
     },
     "node_modules/@babel/code-frame": {
       "version": "7.12.13",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
       "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "@babel/highlight": "^7.12.13"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
       "version": "7.12.11",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.13.10",
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
       "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
       "dev": true
@@ -78,7 +64,6 @@
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
       "integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.12.11",
         "chalk": "^2.0.0",
@@ -87,14 +72,6 @@
     },
     "node_modules/@polka/url": {
       "version": "1.0.0-next.12",
-<<<<<<< HEAD
-      "license": "MIT"
-    },
-    "node_modules/@rollup/plugin-commonjs": {
-      "version": "17.1.0",
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.12.tgz",
       "integrity": "sha512-6RglhutqrGFMO1MNUXp95RBuYIuc8wTnMAV5MUhLmjTOy78ncwOw7RgeQ/HeymkKXRhZd0s2DNrM1rL7unk3MQ=="
     },
@@ -103,7 +80,6 @@
       "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz",
       "integrity": "sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "@rollup/pluginutils": "^3.1.0",
         "commondir": "^1.0.1",
@@ -115,24 +91,13 @@
       },
       "engines": {
         "node": ">= 8.0.0"
-<<<<<<< HEAD
-      },
-      "peerDependencies": {
-        "rollup": "^2.30.0"
-=======
->>>>>>> main
       }
     },
     "node_modules/@rollup/plugin-node-resolve": {
       "version": "11.2.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz",
       "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "@rollup/pluginutils": "^3.1.0",
         "@types/resolve": "1.17.1",
@@ -143,50 +108,26 @@
       },
       "engines": {
         "node": ">= 10.0.0"
-<<<<<<< HEAD
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0"
-=======
->>>>>>> main
       }
     },
     "node_modules/@rollup/plugin-typescript": {
       "version": "8.2.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.2.1.tgz",
       "integrity": "sha512-Qd2E1pleDR4bwyFxqbjt4eJf+wB0UKVMLc7/BAFDGVdAXQMCsD4DUv5/7/ww47BZCYxWtJqe1Lo0KVNswBJlRw==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "@rollup/pluginutils": "^3.1.0",
         "resolve": "^1.17.0"
       },
       "engines": {
         "node": ">=8.0.0"
-<<<<<<< HEAD
-      },
-      "peerDependencies": {
-        "rollup": "^2.14.0",
-        "tslib": "*",
-        "typescript": ">=3.7.0"
-=======
->>>>>>> main
       }
     },
     "node_modules/@rollup/pluginutils": {
       "version": "3.1.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
       "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "@types/estree": "0.0.39",
         "estree-walker": "^1.0.1",
@@ -194,29 +135,25 @@
       },
       "engines": {
         "node": ">= 8.0.0"
-<<<<<<< HEAD
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0"
-=======
->>>>>>> main
       }
     },
     "node_modules/@rollup/pluginutils/node_modules/estree-walker": {
       "version": "1.0.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
+      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
+      "dev": true
     },
     "node_modules/@tsconfig/svelte": {
       "version": "1.0.10",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@tsconfig/svelte/-/svelte-1.0.10.tgz",
+      "integrity": "sha512-EBrpH2iXXfaf/9z81koiDYkp2mlwW2XzFcAqn6qh7VKyP8zBvHHAQzNhY+W9vH5arAjmGAm5g8ElWq6YmXm3ig==",
+      "dev": true
     },
     "node_modules/@types/d3-array": {
       "version": "2.9.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-2.9.0.tgz",
+      "integrity": "sha512-sdBMGfNvLUkBypPMEhOcKcblTQfgHbqbYrUqRE31jOwdDHBJBxz4co2MDAq93S4Cp++phk4UiwoEg/1hK3xXAQ==",
+      "dev": true
     },
     "node_modules/@types/d3-contour": {
       "version": "2.0.0",
@@ -237,32 +174,6 @@
         "@types/geojson": "*"
       }
     },
-    "node_modules/@types/d3-random": {
-      "version": "2.2.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/d3-scale": {
-      "version": "3.2.2",
-      "dev": true,
-      "license": "MIT",
-=======
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/svelte": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/@tsconfig/svelte/-/svelte-1.0.10.tgz",
-      "integrity": "sha512-EBrpH2iXXfaf/9z81koiDYkp2mlwW2XzFcAqn6qh7VKyP8zBvHHAQzNhY+W9vH5arAjmGAm5g8ElWq6YmXm3ig==",
-      "dev": true
-    },
-    "node_modules/@types/d3-array": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-2.9.0.tgz",
-      "integrity": "sha512-sdBMGfNvLUkBypPMEhOcKcblTQfgHbqbYrUqRE31jOwdDHBJBxz4co2MDAq93S4Cp++phk4UiwoEg/1hK3xXAQ==",
-      "dev": true
-    },
     "node_modules/@types/d3-random": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-2.2.0.tgz",
@@ -274,32 +185,12 @@
       "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-3.2.2.tgz",
       "integrity": "sha512-qpQe8G02tzUwt9sdWX1h8A/W0Q1+N48wMnYXVOkrzeLUkCfvzJYV9Ee3aORCS4dN4ONRLFmMvaXdziQ29XGLjQ==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "@types/d3-time": "*"
       }
     },
     "node_modules/@types/d3-scale-chromatic": {
       "version": "2.0.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/d3-time": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/estree": {
-      "version": "0.0.39",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/geojson": {
-      "version": "7946.0.7",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz",
-      "integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==",
-=======
       "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-2.0.0.tgz",
       "integrity": "sha512-Y62+2clOwZoKua84Ha0xU77w7lePiaBoTjXugT4l8Rd5LAk+Mn/ZDtrgs087a+B5uJ3jYUHHtKw5nuEzp0WBHw==",
       "dev": true
@@ -314,30 +205,16 @@
       "version": "0.0.39",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
       "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
->>>>>>> main
+      "dev": true
+    },
+    "node_modules/@types/geojson": {
+      "version": "7946.0.7",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.7.tgz",
+      "integrity": "sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ==",
       "dev": true
     },
     "node_modules/@types/katex": {
       "version": "0.11.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/node": {
-      "version": "14.14.37",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/pug": {
-      "version": "2.0.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/resolve": {
-      "version": "1.17.1",
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/@types/katex/-/katex-0.11.0.tgz",
       "integrity": "sha512-27BfE8zASRLYfSBNMk5/+KIjr2CBBrH0i5lhsO04fca4TGirIIMay73v3zNkzqmsaeIa/Mi5kejWDcxPLAmkvA==",
       "dev": true
@@ -359,35 +236,24 @@
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
       "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/sass": {
       "version": "1.16.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/@types/sass/-/sass-1.16.0.tgz",
       "integrity": "sha512-2XZovu4NwcqmtZtsBR5XYLw18T8cBCnU2USFHTnYLLHz9fkhnoEMoDsqShJIOFsFhn5aJHjweiUUdTrDGujegA==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/ansi-styles": {
       "version": "3.2.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -397,14 +263,9 @@
     },
     "node_modules/anymatch": {
       "version": "3.1.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "ISC",
-=======
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
       "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -415,15 +276,6 @@
     },
     "node_modules/balanced-match": {
       "version": "1.0.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.1.tgz",
       "integrity": "sha512-qyTw2VPYRg31SlVU5WDdvCSyMTJ3YSP4Kz2CidWZFPFawCiHJdCyKyZeXIGMJ5ebMQYXEI56kDR8tcnDkbZstg==",
       "dev": true
@@ -433,21 +285,15 @@
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -455,14 +301,9 @@
     },
     "node_modules/braces": {
       "version": "3.0.2",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "fill-range": "^7.0.1"
       },
@@ -472,20 +313,6 @@
     },
     "node_modules/buffer-from": {
       "version": "1.1.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/builtin-modules": {
-      "version": "3.2.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-=======
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
       "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
       "dev": true
@@ -497,33 +324,22 @@
       "dev": true,
       "engines": {
         "node": ">=6"
->>>>>>> main
       }
     },
     "node_modules/callsites": {
       "version": "3.1.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/chalk": {
       "version": "2.4.2",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -535,14 +351,9 @@
     },
     "node_modules/chokidar": {
       "version": "3.5.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
       "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "anymatch": "~3.1.1",
         "braces": "~3.0.2",
@@ -561,43 +372,15 @@
     },
     "node_modules/color-convert": {
       "version": "1.9.3",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "color-name": "1.1.3"
       }
     },
     "node_modules/color-name": {
       "version": "1.1.3",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/commander": {
-      "version": "2.20.3",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/console-clear": {
-      "version": "1.1.1",
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
@@ -624,7 +407,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/console-clear/-/console-clear-1.1.1.tgz",
       "integrity": "sha512-pMD+MVR538ipqkG5JXeOEbKWS5um1H4LUUccUQG68qpeqBYbzYy79Gh55jkd2TtPdRfUaLWdv6LPP//5Zt0aPQ==",
->>>>>>> main
       "engines": {
         "node": ">=4"
       }
@@ -640,9 +422,9 @@
     },
     "node_modules/d3-color": {
       "version": "2.0.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz",
+      "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==",
+      "dev": true
     },
     "node_modules/d3-contour": {
       "version": "2.0.0",
@@ -655,8 +437,9 @@
     },
     "node_modules/d3-format": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz",
+      "integrity": "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==",
+      "dev": true
     },
     "node_modules/d3-geo": {
       "version": "2.0.1",
@@ -667,41 +450,20 @@
         "d3-array": ">=2.5"
       }
     },
-    "node_modules/d3-interpolate": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "BSD-3-Clause",
-=======
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz",
-      "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==",
-      "dev": true
-    },
-    "node_modules/d3-format": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz",
-      "integrity": "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==",
-      "dev": true
-    },
     "node_modules/d3-interpolate": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz",
       "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "d3-color": "1 - 2"
       }
     },
     "node_modules/d3-random": {
       "version": "2.2.2",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "BSD-3-Clause"
-=======
       "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-2.2.2.tgz",
       "integrity": "sha512-0D9P8TRj6qDAtHhRQn6EfdOtHMfsUWanl3yb/84C4DqpZ+VsgfI5iTVRNRbELCfNvRfpMr8OrqqUTQ6ANGCijw==",
       "dev": true
->>>>>>> main
     },
     "node_modules/d3-scale": {
       "version": "3.2.4",
@@ -718,14 +480,9 @@
     },
     "node_modules/d3-scale-chromatic": {
       "version": "2.0.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "BSD-3-Clause",
-=======
       "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-2.0.0.tgz",
       "integrity": "sha512-LLqy7dJSL8yDy7NRmf6xSlsFZ6zYvJ4BcWFE4zBrOPnQERv9zj24ohnXKRbyi9YHnYV+HN1oEO3iFK971/gkzA==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "d3-color": "1 - 2",
         "d3-interpolate": "1 - 2"
@@ -733,15 +490,6 @@
     },
     "node_modules/d3-time": {
       "version": "2.0.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/d3-time-format": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "BSD-3-Clause",
-=======
       "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.0.0.tgz",
       "integrity": "sha512-2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q==",
       "dev": true
@@ -751,64 +499,39 @@
       "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz",
       "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "d3-time": "1 - 2"
       }
     },
     "node_modules/deepmerge": {
       "version": "4.2.2",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
       "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/detect-indent": {
       "version": "6.0.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz",
       "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/estree-walker": {
       "version": "2.0.2",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
       "dev": true
@@ -818,7 +541,6 @@
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -828,19 +550,6 @@
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/get-port": {
-      "version": "3.2.0",
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
@@ -868,21 +577,15 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
       "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=",
->>>>>>> main
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/glob": {
       "version": "7.1.6",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "ISC",
-=======
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
       "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -893,24 +596,13 @@
       },
       "engines": {
         "node": "*"
-<<<<<<< HEAD
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-=======
->>>>>>> main
       }
     },
     "node_modules/glob-parent": {
       "version": "5.1.2",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "ISC",
-=======
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -920,14 +612,9 @@
     },
     "node_modules/has": {
       "version": "1.0.3",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "function-bind": "^1.1.1"
       },
@@ -937,52 +624,31 @@
     },
     "node_modules/has-flag": {
       "version": "3.0.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
       },
       "engines": {
         "node": ">=6"
-<<<<<<< HEAD
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-=======
->>>>>>> main
       }
     },
     "node_modules/inflight": {
       "version": "1.0.6",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "ISC",
-=======
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -990,25 +656,6 @@
     },
     "node_modules/inherits": {
       "version": "2.0.4",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/internmap": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/is-any-array": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
@@ -1030,7 +677,6 @@
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -1040,47 +686,27 @@
     },
     "node_modules/is-core-module": {
       "version": "2.2.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-=======
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
       "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
->>>>>>> main
       }
     },
     "node_modules/is-extglob": {
       "version": "2.1.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-glob": {
       "version": "4.0.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
       "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -1090,15 +716,6 @@
     },
     "node_modules/is-module": {
       "version": "1.0.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
       "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
       "dev": true
@@ -1108,35 +725,24 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=0.12.0"
       }
     },
     "node_modules/is-reference": {
       "version": "1.2.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
       "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "@types/estree": "*"
       }
     },
     "node_modules/jest-worker": {
       "version": "26.6.2",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
       "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -1148,28 +754,18 @@
     },
     "node_modules/jest-worker/node_modules/has-flag": {
       "version": "4.0.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/jest-worker/node_modules/supports-color": {
       "version": "7.2.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -1179,15 +775,6 @@
     },
     "node_modules/js-tokens": {
       "version": "4.0.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/katex": {
-      "version": "0.13.2",
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
@@ -1197,7 +784,6 @@
       "resolved": "https://registry.npmjs.org/katex/-/katex-0.13.2.tgz",
       "integrity": "sha512-u/KhjFDhyPr+70aiBn9SL/9w/QlLagIXBi2NZSbNnBUp2tR8dCjQplyEMkEzniem5gOeSCBjlBUg4VaiWs1JJg==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "commander": "^6.0.0"
       },
@@ -1207,40 +793,26 @@
     },
     "node_modules/katex/node_modules/commander": {
       "version": "6.2.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
       "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/kleur": {
       "version": "3.0.3",
-<<<<<<< HEAD
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
->>>>>>> main
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/livereload": {
       "version": "0.9.3",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/livereload/-/livereload-0.9.3.tgz",
       "integrity": "sha512-q7Z71n3i4X0R9xthAryBdNGVGAO2R5X+/xXpmKeuPMrteg+W2U8VusTKV3YiJbXZwKsOlFlHe+go6uSNjfxrZw==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "chokidar": "^3.5.0",
         "livereload-js": "^3.3.1",
@@ -1256,14 +828,6 @@
     },
     "node_modules/livereload-js": {
       "version": "3.3.2",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/local-access": {
-      "version": "1.1.0",
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-3.3.2.tgz",
       "integrity": "sha512-w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA==",
       "dev": true
@@ -1272,35 +836,21 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/local-access/-/local-access-1.1.0.tgz",
       "integrity": "sha512-XfegD5pyTAfb+GY6chk283Ox5z8WexG56OvM06RWLpAc/UHozO8X6xAxEkIitZOtsSMM1Yr3DkHgW5W+onLhCw==",
->>>>>>> main
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/magic-string": {
       "version": "0.25.7",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
       "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "sourcemap-codec": "^1.4.4"
       }
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/mime": {
-      "version": "2.5.2",
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
       "dev": true
@@ -1309,7 +859,6 @@
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
       "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
->>>>>>> main
       "bin": {
         "mime": "cli.js"
       },
@@ -1319,28 +868,18 @@
     },
     "node_modules/min-indent": {
       "version": "1.0.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
       "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/minimatch": {
       "version": "3.0.4",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "ISC",
-=======
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -1350,15 +889,6 @@
     },
     "node_modules/minimist": {
       "version": "1.2.5",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/ml-array-max": {
-      "version": "1.2.3",
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "dev": true
@@ -1368,35 +898,24 @@
       "resolved": "https://registry.npmjs.org/ml-array-max/-/ml-array-max-1.2.3.tgz",
       "integrity": "sha512-49YwnLlAf4/E/VyezUz+SNfSBhPE8JTahxRPuyM9S9Uv+ft5x0C8A4trtkDgrttMxoxbhudTA1yg8zgJZaYtpA==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "is-any-array": "^1.0.0"
       }
     },
     "node_modules/ml-array-min": {
       "version": "1.2.2",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/ml-array-min/-/ml-array-min-1.2.2.tgz",
       "integrity": "sha512-yidQcOHFaGEuVr6FcwAn+QvKXJv1Lxel5fyKrO+aXGJGp97Mt+p8r21WYtikS/PTVbxdSrliQ0UK4wSHYHHgzQ==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "is-any-array": "^1.0.0"
       }
     },
     "node_modules/ml-array-rescale": {
       "version": "1.3.5",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/ml-array-rescale/-/ml-array-rescale-1.3.5.tgz",
       "integrity": "sha512-czK+faN7kYrF48SgVQeXGkxUjDEas6BA4EzF4jJNh8UEtzpSvHW3RllZCJCCyrAqeFc+Y/LhgYUzuHFpevM3qA==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "is-any-array": "^1.0.0",
         "ml-array-max": "^1.2.3",
@@ -1414,55 +933,32 @@
     },
     "node_modules/mri": {
       "version": "1.1.6",
-<<<<<<< HEAD
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.6.tgz",
       "integrity": "sha512-oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ==",
->>>>>>> main
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/once": {
       "version": "1.4.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "ISC",
-=======
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "wrappy": "1"
       }
     },
     "node_modules/opts": {
       "version": "2.0.2",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/opts/-/opts-2.0.2.tgz",
       "integrity": "sha512-k41FwbcLnlgnFh69f4qdUfvDQ+5vaSDnVPFI/y5XuhKRq97EnVVneO9F1ESVCdiVu4fCS2L8usX3mU331hB7pg==",
       "dev": true
@@ -1472,7 +968,6 @@
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -1482,34 +977,15 @@
     },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/path-parse": {
       "version": "1.0.6",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/picomatch": {
-      "version": "2.2.2",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-=======
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
@@ -1521,19 +997,13 @@
       "dev": true,
       "engines": {
         "node": ">=8.6"
->>>>>>> main
       }
     },
     "node_modules/prettier": {
       "version": "2.2.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz",
       "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==",
       "dev": true,
->>>>>>> main
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -1543,19 +1013,6 @@
     },
     "node_modules/prettier-plugin-svelte": {
       "version": "2.2.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "prettier": "^1.16.4 || ^2.0.0",
-        "svelte": "^3.2.0"
-      }
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.2.0.tgz",
       "integrity": "sha512-Xdmqgr71tAuMqqzNCK52/v94g/Yv7V7lz+nmbO9NEA+9ol15VV3uUHOfydMNOo3SWvFaVlBcp947ebEaMWqVfQ==",
       "dev": true
@@ -1565,21 +1022,15 @@
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
     },
     "node_modules/readdirp": {
       "version": "3.5.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
       "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -1589,24 +1040,9 @@
     },
     "node_modules/require-relative": {
       "version": "0.8.7",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/resolve": {
-      "version": "1.20.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-=======
-      "resolved": "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz",
-      "integrity": "sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=",
-      "dev": true
+      "resolved": "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz",
+      "integrity": "sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=",
+      "dev": true
     },
     "node_modules/resolve": {
       "version": "1.20.0",
@@ -1616,33 +1052,22 @@
       "dependencies": {
         "is-core-module": "^2.2.0",
         "path-parse": "^1.0.6"
->>>>>>> main
       }
     },
     "node_modules/resolve-from": {
       "version": "4.0.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/rollup": {
       "version": "2.44.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.44.0.tgz",
       "integrity": "sha512-rGSF4pLwvuaH/x4nAS+zP6UNn5YUDWf/TeEU5IoXSZKBbKRNTCI3qMnYXKZgrC0D2KzS2baiOZt1OlqhMu5rnQ==",
       "dev": true,
->>>>>>> main
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -1655,61 +1080,34 @@
     },
     "node_modules/rollup-plugin-css-only": {
       "version": "3.1.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/rollup-plugin-css-only/-/rollup-plugin-css-only-3.1.0.tgz",
       "integrity": "sha512-TYMOE5uoD76vpj+RTkQLzC9cQtbnJNktHPB507FzRWBVaofg7KhIqq1kGbcVOadARSozWF883Ho9KpSPKH8gqA==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "@rollup/pluginutils": "4"
       },
       "engines": {
         "node": ">=10.12.0"
-<<<<<<< HEAD
-      },
-      "peerDependencies": {
-        "rollup": "1 || 2"
-=======
->>>>>>> main
       }
     },
     "node_modules/rollup-plugin-css-only/node_modules/@rollup/pluginutils": {
       "version": "4.1.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.1.0.tgz",
       "integrity": "sha512-TrBhfJkFxA+ER+ew2U2/fHbebhLT/l/2pRk0hfj9KusXUuRXd2v0R58AfaZK9VXDQ4TogOSEmICVrQAA3zFnHQ==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "estree-walker": "^2.0.1",
         "picomatch": "^2.2.2"
       },
       "engines": {
         "node": ">= 8.0.0"
-<<<<<<< HEAD
-      },
-      "peerDependencies": {
-        "rollup": "^1.20.0||^2.0.0"
-=======
->>>>>>> main
       }
     },
     "node_modules/rollup-plugin-livereload": {
       "version": "2.0.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/rollup-plugin-livereload/-/rollup-plugin-livereload-2.0.0.tgz",
       "integrity": "sha512-oC/8NqumGYuphkqrfszOHUUIwzKsaHBICw6QRwT5uD07gvePTS+HW+GFwu6f9K8W02CUuTvtIM9AWJrbj4wE1A==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "livereload": "^0.9.1"
       },
@@ -1719,76 +1117,40 @@
     },
     "node_modules/rollup-plugin-svelte": {
       "version": "7.1.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/rollup-plugin-svelte/-/rollup-plugin-svelte-7.1.0.tgz",
       "integrity": "sha512-vopCUq3G+25sKjwF5VilIbiY6KCuMNHP1PFvx2Vr3REBNMDllKHFZN2B9jwwC+MqNc3UPKkjXnceLPEjTjXGXg==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "require-relative": "^0.8.7",
         "rollup-pluginutils": "^2.8.2"
       },
       "engines": {
         "node": ">=10"
-<<<<<<< HEAD
-      },
-      "peerDependencies": {
-        "rollup": ">=2.0.0",
-        "svelte": ">=3.5.0"
-=======
->>>>>>> main
       }
     },
     "node_modules/rollup-plugin-terser": {
       "version": "7.0.2",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
       "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "jest-worker": "^26.2.1",
         "serialize-javascript": "^4.0.0",
         "terser": "^5.0.0"
-<<<<<<< HEAD
-      },
-      "peerDependencies": {
-        "rollup": "^2.0.0"
-=======
->>>>>>> main
       }
     },
     "node_modules/rollup-pluginutils": {
       "version": "2.8.2",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
       "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "estree-walker": "^0.6.1"
       }
     },
     "node_modules/rollup-pluginutils/node_modules/estree-walker": {
       "version": "0.6.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/sade": {
-      "version": "1.7.4",
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
       "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
       "dev": true
@@ -1797,7 +1159,6 @@
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/sade/-/sade-1.7.4.tgz",
       "integrity": "sha512-y5yauMD93rX840MwUJr7C1ysLFBgMspsdTo4UVrDg3fXDvtwOyIqykhVAAm6fk/3au77773itJStObgK+LKaiA==",
->>>>>>> main
       "dependencies": {
         "mri": "^1.1.0"
       },
@@ -1807,28 +1168,6 @@
     },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
-<<<<<<< HEAD
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/semiver": {
-      "version": "1.1.0",
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
       "dev": true
@@ -1837,33 +1176,23 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/semiver/-/semiver-1.1.0.tgz",
       "integrity": "sha512-QNI2ChmuioGC1/xjyYwyZYADILWyW6AmS1UH6gDj/SFUUUS4MBAWs/7mxnkRPc/F4iHezDP+O8t0dO8WHiEOdg==",
->>>>>>> main
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/serialize-javascript": {
       "version": "4.0.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "BSD-3-Clause",
-=======
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
       "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "randombytes": "^2.1.0"
       }
     },
     "node_modules/sirv": {
       "version": "1.0.11",
-<<<<<<< HEAD
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.11.tgz",
       "integrity": "sha512-SR36i3/LSWja7AJNRBz4fF/Xjpn7lQFI30tZ434dIy+bitLYSP+ZEenHg36i23V2SGEz+kqjksg0uOGZ5LPiqg==",
->>>>>>> main
       "dependencies": {
         "@polka/url": "^1.0.0-next.9",
         "mime": "^2.3.1",
@@ -1875,12 +1204,8 @@
     },
     "node_modules/sirv-cli": {
       "version": "1.0.11",
-<<<<<<< HEAD
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/sirv-cli/-/sirv-cli-1.0.11.tgz",
       "integrity": "sha512-L8NILoRSBd38VcfFcERYCaVCnWPBLo9G6u/a37UJ8Ysv4DfjizMbFBcM+SswNnndJienhR6qy8KFuAEaeL4g8Q==",
->>>>>>> main
       "dependencies": {
         "console-clear": "^1.1.0",
         "get-port": "^3.2.0",
@@ -1900,28 +1225,18 @@
     },
     "node_modules/source-map": {
       "version": "0.7.3",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "BSD-3-Clause",
-=======
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
       "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/source-map-support": {
       "version": "0.5.19",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
       "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -1929,29 +1244,15 @@
     },
     "node_modules/source-map-support/node_modules/source-map": {
       "version": "0.6.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "BSD-3-Clause",
-=======
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
       "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/sourcemap-codec": {
       "version": "1.4.8",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/strip-indent": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
       "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
       "dev": true
@@ -1961,7 +1262,6 @@
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
       "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "min-indent": "^1.0.0"
       },
@@ -1971,14 +1271,9 @@
     },
     "node_modules/supports-color": {
       "version": "5.5.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -1988,28 +1283,18 @@
     },
     "node_modules/svelte": {
       "version": "3.37.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.37.0.tgz",
       "integrity": "sha512-TRF30F4W4+d+Jr2KzUUL1j8Mrpns/WM/WacxYlo5MMb2E5Qy2Pk1Guj6GylxsW9OnKQl1tnF8q3hG/hQ3h6VUA==",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/svelte-check": {
       "version": "1.3.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-1.3.0.tgz",
       "integrity": "sha512-FMLZr/wv9S0MzCALo9BlHYyu1wlgXRdHWSjXDiknhraL9Igm0EVb00/tR6CMJ7j4q2kphRIEYcSRQJ7AtXHk+g==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "chalk": "^4.0.0",
         "chokidar": "^3.4.1",
@@ -2022,71 +1307,38 @@
       },
       "bin": {
         "svelte-check": "bin/svelte-check"
-<<<<<<< HEAD
-      },
-      "peerDependencies": {
-        "svelte": "^3.24.0"
-=======
->>>>>>> main
       }
     },
     "node_modules/svelte-check/node_modules/ansi-styles": {
       "version": "4.3.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "color-convert": "^2.0.1"
       },
       "engines": {
         "node": ">=8"
-<<<<<<< HEAD
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-=======
->>>>>>> main
       }
     },
     "node_modules/svelte-check/node_modules/chalk": {
       "version": "4.1.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
       "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
       },
       "engines": {
         "node": ">=10"
-<<<<<<< HEAD
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-=======
->>>>>>> main
       }
     },
     "node_modules/svelte-check/node_modules/color-convert": {
       "version": "2.0.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -2096,15 +1348,6 @@
     },
     "node_modules/svelte-check/node_modules/color-name": {
       "version": "1.1.4",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/svelte-check/node_modules/has-flag": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
@@ -2114,21 +1357,15 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/svelte-check/node_modules/supports-color": {
       "version": "7.2.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -2136,32 +1373,12 @@
         "node": ">=8"
       }
     },
-<<<<<<< HEAD
-    "node_modules/svelte-collapse": {
-      "version": "0.0.2",
-      "dev": true
-    },
-    "node_modules/svelte-collapsible": {
-      "version": "0.0.8",
-      "dev": true,
-      "dependencies": {
-        "sirv-cli": "^1.0.0",
-        "svelte-collapse": "0.0.2"
-      }
-    },
-    "node_modules/svelte-preprocess": {
-      "version": "4.7.0",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-=======
     "node_modules/svelte-preprocess": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.7.0.tgz",
       "integrity": "sha512-iNrY4YGqi0LD2e6oT9YbdSzOKntxk8gmzfqso1z/lUJOZh4o6fyIqkirmiZ8/dDJFqtIE1spVgDFWgkfhLEYlw==",
       "dev": true,
       "hasInstallScript": true,
->>>>>>> main
       "dependencies": {
         "@types/pug": "^2.0.4",
         "@types/sass": "^1.16.0",
@@ -2170,69 +1387,13 @@
       },
       "engines": {
         "node": ">= 9.11.2"
-<<<<<<< HEAD
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.10.2",
-        "coffeescript": "^2.5.1",
-        "less": "^3.11.3",
-        "postcss": "^7 || ^8",
-        "postcss-load-config": "^2.1.0 || ^3.0.0",
-        "pug": "^3.0.0",
-        "sass": "^1.26.8",
-        "stylus": "^0.54.7",
-        "sugarss": "^2.0.0",
-        "svelte": "^3.23.0",
-        "typescript": "^3.9.5 || ^4.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@babel/core": {
-          "optional": true
-        },
-        "coffeescript": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "node-sass": {
-          "optional": true
-        },
-        "postcss": {
-          "optional": true
-        },
-        "postcss-load-config": {
-          "optional": true
-        },
-        "pug": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "typescript": {
-          "optional": true
-        }
-=======
->>>>>>> main
       }
     },
     "node_modules/terser": {
       "version": "5.6.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "BSD-2-Clause",
-=======
       "resolved": "https://registry.npmjs.org/terser/-/terser-5.6.1.tgz",
       "integrity": "sha512-yv9YLFQQ+3ZqgWCUk+pvNJwgUTdlIxUk1WTN+RnaFJe2L7ipG2csPT0ra2XRm7Cs8cxN7QXmK1rFzEwYEQkzXw==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "commander": "^2.20.0",
         "source-map": "~0.7.2",
@@ -2247,26 +1408,17 @@
     },
     "node_modules/tinydate": {
       "version": "1.3.0",
-<<<<<<< HEAD
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/tinydate/-/tinydate-1.3.0.tgz",
       "integrity": "sha512-7cR8rLy2QhYHpsBDBVYnnWXm8uRTr38RoZakFSW7Bs7PzfMPNZthuMLkwqZv7MTu8lhQ91cOFYS5a7iFj2oR3w==",
->>>>>>> main
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
->>>>>>> main
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -2276,27 +1428,14 @@
     },
     "node_modules/totalist": {
       "version": "1.1.0",
-<<<<<<< HEAD
-      "license": "MIT",
-=======
       "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
       "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
->>>>>>> main
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/tslib": {
       "version": "2.2.0",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "0BSD"
-    },
-    "node_modules/typescript": {
-      "version": "4.2.3",
-      "dev": true,
-      "license": "Apache-2.0",
-=======
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
       "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==",
       "dev": true
@@ -2306,7 +1445,6 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz",
       "integrity": "sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==",
       "dev": true,
->>>>>>> main
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -2317,29 +1455,6 @@
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
-<<<<<<< HEAD
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/ws": {
-      "version": "7.4.4",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-=======
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
@@ -2351,13 +1466,14 @@
       "dev": true,
       "engines": {
         "node": ">=8.3.0"
->>>>>>> main
       }
     }
   },
   "dependencies": {
     "@babel/code-frame": {
       "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
       "dev": true,
       "requires": {
         "@babel/highlight": "^7.12.13"
@@ -2365,10 +1481,14 @@
     },
     "@babel/helper-validator-identifier": {
       "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
       "dev": true
     },
     "@babel/highlight": {
       "version": "7.13.10",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
+      "integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
       "dev": true,
       "requires": {
         "@babel/helper-validator-identifier": "^7.12.11",
@@ -2377,10 +1497,14 @@
       }
     },
     "@polka/url": {
-      "version": "1.0.0-next.12"
+      "version": "1.0.0-next.12",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.12.tgz",
+      "integrity": "sha512-6RglhutqrGFMO1MNUXp95RBuYIuc8wTnMAV5MUhLmjTOy78ncwOw7RgeQ/HeymkKXRhZd0s2DNrM1rL7unk3MQ=="
     },
     "@rollup/plugin-commonjs": {
       "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz",
+      "integrity": "sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==",
       "dev": true,
       "requires": {
         "@rollup/pluginutils": "^3.1.0",
@@ -2394,6 +1518,8 @@
     },
     "@rollup/plugin-node-resolve": {
       "version": "11.2.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz",
+      "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==",
       "dev": true,
       "requires": {
         "@rollup/pluginutils": "^3.1.0",
@@ -2406,6 +1532,8 @@
     },
     "@rollup/plugin-typescript": {
       "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-8.2.1.tgz",
+      "integrity": "sha512-Qd2E1pleDR4bwyFxqbjt4eJf+wB0UKVMLc7/BAFDGVdAXQMCsD4DUv5/7/ww47BZCYxWtJqe1Lo0KVNswBJlRw==",
       "dev": true,
       "requires": {
         "@rollup/pluginutils": "^3.1.0",
@@ -2414,6 +1542,8 @@
     },
     "@rollup/pluginutils": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
+      "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
       "dev": true,
       "requires": {
         "@types/estree": "0.0.39",
@@ -2423,16 +1553,22 @@
       "dependencies": {
         "estree-walker": {
           "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
+          "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
           "dev": true
         }
       }
     },
     "@tsconfig/svelte": {
       "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@tsconfig/svelte/-/svelte-1.0.10.tgz",
+      "integrity": "sha512-EBrpH2iXXfaf/9z81koiDYkp2mlwW2XzFcAqn6qh7VKyP8zBvHHAQzNhY+W9vH5arAjmGAm5g8ElWq6YmXm3ig==",
       "dev": true
     },
     "@types/d3-array": {
       "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-2.9.0.tgz",
+      "integrity": "sha512-sdBMGfNvLUkBypPMEhOcKcblTQfgHbqbYrUqRE31jOwdDHBJBxz4co2MDAq93S4Cp++phk4UiwoEg/1hK3xXAQ==",
       "dev": true
     },
     "@types/d3-contour": {
@@ -2456,10 +1592,14 @@
     },
     "@types/d3-random": {
       "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-2.2.0.tgz",
+      "integrity": "sha512-Hjfj9m68NmYZzushzEG7etPvKH/nj9b9s9+qtkNG3/dbRBjQZQg1XS6nRuHJcCASTjxXlyXZnKu2gDxyQIIu9A==",
       "dev": true
     },
     "@types/d3-scale": {
       "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-3.2.2.tgz",
+      "integrity": "sha512-qpQe8G02tzUwt9sdWX1h8A/W0Q1+N48wMnYXVOkrzeLUkCfvzJYV9Ee3aORCS4dN4ONRLFmMvaXdziQ29XGLjQ==",
       "dev": true,
       "requires": {
         "@types/d3-time": "*"
@@ -2467,14 +1607,20 @@
     },
     "@types/d3-scale-chromatic": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale-chromatic/-/d3-scale-chromatic-2.0.0.tgz",
+      "integrity": "sha512-Y62+2clOwZoKua84Ha0xU77w7lePiaBoTjXugT4l8Rd5LAk+Mn/ZDtrgs087a+B5uJ3jYUHHtKw5nuEzp0WBHw==",
       "dev": true
     },
     "@types/d3-time": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-2.0.0.tgz",
+      "integrity": "sha512-Abz8bTzy8UWDeYs9pCa3D37i29EWDjNTjemdk0ei1ApYVNqulYlGUKip/jLOpogkPSsPz/GvZCYiC7MFlEk0iQ==",
       "dev": true
     },
     "@types/estree": {
       "version": "0.0.39",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
+      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
       "dev": true
     },
     "@types/geojson": {
@@ -2485,18 +1631,26 @@
     },
     "@types/katex": {
       "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@types/katex/-/katex-0.11.0.tgz",
+      "integrity": "sha512-27BfE8zASRLYfSBNMk5/+KIjr2CBBrH0i5lhsO04fca4TGirIIMay73v3zNkzqmsaeIa/Mi5kejWDcxPLAmkvA==",
       "dev": true
     },
     "@types/node": {
       "version": "14.14.37",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz",
+      "integrity": "sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==",
       "dev": true
     },
     "@types/pug": {
       "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/pug/-/pug-2.0.4.tgz",
+      "integrity": "sha1-h3L80EGOPNLMFxVV1zAHQVBR9LI=",
       "dev": true
     },
     "@types/resolve": {
       "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
+      "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -2504,6 +1658,8 @@
     },
     "@types/sass": {
       "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/@types/sass/-/sass-1.16.0.tgz",
+      "integrity": "sha512-2XZovu4NwcqmtZtsBR5XYLw18T8cBCnU2USFHTnYLLHz9fkhnoEMoDsqShJIOFsFhn5aJHjweiUUdTrDGujegA==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -2511,6 +1667,8 @@
     },
     "ansi-styles": {
       "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "requires": {
         "color-convert": "^1.9.0"
@@ -2518,6 +1676,8 @@
     },
     "anymatch": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
       "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
@@ -2526,14 +1686,20 @@
     },
     "balanced-match": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.1.tgz",
+      "integrity": "sha512-qyTw2VPYRg31SlVU5WDdvCSyMTJ3YSP4Kz2CidWZFPFawCiHJdCyKyZeXIGMJ5ebMQYXEI56kDR8tcnDkbZstg==",
       "dev": true
     },
     "binary-extensions": {
       "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true
     },
     "brace-expansion": {
       "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
       "requires": {
         "balanced-match": "^1.0.0",
@@ -2542,6 +1708,8 @@
     },
     "braces": {
       "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "dev": true,
       "requires": {
         "fill-range": "^7.0.1"
@@ -2549,18 +1717,26 @@
     },
     "buffer-from": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
       "dev": true
     },
     "builtin-modules": {
       "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
+      "integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
       "dev": true
     },
     "callsites": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true
     },
     "chalk": {
       "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
       "requires": {
         "ansi-styles": "^3.2.1",
@@ -2570,6 +1746,8 @@
     },
     "chokidar": {
       "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
       "dev": true,
       "requires": {
         "anymatch": "~3.1.1",
@@ -2584,6 +1762,8 @@
     },
     "color-convert": {
       "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
       "requires": {
         "color-name": "1.1.3"
@@ -2591,22 +1771,32 @@
     },
     "color-name": {
       "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
     "commander": {
       "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
     "commondir": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
     "concat-map": {
       "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
     "console-clear": {
-      "version": "1.1.1"
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/console-clear/-/console-clear-1.1.1.tgz",
+      "integrity": "sha512-pMD+MVR538ipqkG5JXeOEbKWS5um1H4LUUccUQG68qpeqBYbzYy79Gh55jkd2TtPdRfUaLWdv6LPP//5Zt0aPQ=="
     },
     "d3-array": {
       "version": "2.12.1",
@@ -2619,6 +1809,8 @@
     },
     "d3-color": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz",
+      "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==",
       "dev": true
     },
     "d3-contour": {
@@ -2632,6 +1824,8 @@
     },
     "d3-format": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz",
+      "integrity": "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==",
       "dev": true
     },
     "d3-geo": {
@@ -2645,6 +1839,8 @@
     },
     "d3-interpolate": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz",
+      "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==",
       "dev": true,
       "requires": {
         "d3-color": "1 - 2"
@@ -2652,6 +1848,8 @@
     },
     "d3-random": {
       "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-2.2.2.tgz",
+      "integrity": "sha512-0D9P8TRj6qDAtHhRQn6EfdOtHMfsUWanl3yb/84C4DqpZ+VsgfI5iTVRNRbELCfNvRfpMr8OrqqUTQ6ANGCijw==",
       "dev": true
     },
     "d3-scale": {
@@ -2669,6 +1867,8 @@
     },
     "d3-scale-chromatic": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-2.0.0.tgz",
+      "integrity": "sha512-LLqy7dJSL8yDy7NRmf6xSlsFZ6zYvJ4BcWFE4zBrOPnQERv9zj24ohnXKRbyi9YHnYV+HN1oEO3iFK971/gkzA==",
       "dev": true,
       "requires": {
         "d3-color": "1 - 2",
@@ -2677,10 +1877,14 @@
     },
     "d3-time": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.0.0.tgz",
+      "integrity": "sha512-2mvhstTFcMvwStWd9Tj3e6CEqtOivtD8AUiHT8ido/xmzrI9ijrUUihZ6nHuf/vsScRBonagOdj0Vv+SEL5G3Q==",
       "dev": true
     },
     "d3-time-format": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz",
+      "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==",
       "dev": true,
       "requires": {
         "d3-time": "1 - 2"
@@ -2688,22 +1892,32 @@
     },
     "deepmerge": {
       "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
       "dev": true
     },
     "detect-indent": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz",
+      "integrity": "sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==",
       "dev": true
     },
     "escape-string-regexp": {
       "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
       "dev": true
     },
     "estree-walker": {
       "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
       "dev": true
     },
     "fill-range": {
       "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"
@@ -2711,17 +1925,32 @@
     },
     "fs.realpath": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
+    "fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "optional": true
+    },
     "function-bind": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
     "get-port": {
-      "version": "3.2.0"
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
+      "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw="
     },
     "glob": {
       "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
       "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
@@ -2734,6 +1963,8 @@
     },
     "glob-parent": {
       "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
       "requires": {
         "is-glob": "^4.0.1"
@@ -2741,6 +1972,8 @@
     },
     "has": {
       "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dev": true,
       "requires": {
         "function-bind": "^1.1.1"
@@ -2748,10 +1981,14 @@
     },
     "has-flag": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
       "dev": true
     },
     "import-fresh": {
       "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
       "requires": {
         "parent-module": "^1.0.0",
@@ -2760,6 +1997,8 @@
     },
     "inflight": {
       "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
       "dev": true,
       "requires": {
         "once": "^1.3.0",
@@ -2768,18 +2007,26 @@
     },
     "inherits": {
       "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
     "internmap": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
+      "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==",
       "dev": true
     },
     "is-any-array": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-any-array/-/is-any-array-1.0.0.tgz",
+      "integrity": "sha512-0o0ZsgObnylv72nO39P6M+PL7jPUEx39O6BEfZuX36IKPy/RpdudxluAIaRn/LZi5eVPDMlMBaLABzOK6bwPlw==",
       "dev": true
     },
     "is-binary-path": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
       "requires": {
         "binary-extensions": "^2.0.0"
@@ -2787,6 +2034,8 @@
     },
     "is-core-module": {
       "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
+      "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
@@ -2794,10 +2043,14 @@
     },
     "is-extglob": {
       "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true
     },
     "is-glob": {
       "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
       "dev": true,
       "requires": {
         "is-extglob": "^2.1.1"
@@ -2805,14 +2058,20 @@
     },
     "is-module": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
+      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
       "dev": true
     },
     "is-number": {
       "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true
     },
     "is-reference": {
       "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
+      "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
       "dev": true,
       "requires": {
         "@types/estree": "*"
@@ -2820,6 +2079,8 @@
     },
     "jest-worker": {
       "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -2829,10 +2090,14 @@
       "dependencies": {
         "has-flag": {
           "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -2842,10 +2107,14 @@
     },
     "js-tokens": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
     "katex": {
       "version": "0.13.2",
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.13.2.tgz",
+      "integrity": "sha512-u/KhjFDhyPr+70aiBn9SL/9w/QlLagIXBi2NZSbNnBUp2tR8dCjQplyEMkEzniem5gOeSCBjlBUg4VaiWs1JJg==",
       "dev": true,
       "requires": {
         "commander": "^6.0.0"
@@ -2853,15 +2122,21 @@
       "dependencies": {
         "commander": {
           "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+          "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
           "dev": true
         }
       }
     },
     "kleur": {
-      "version": "3.0.3"
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="
     },
     "livereload": {
       "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/livereload/-/livereload-0.9.3.tgz",
+      "integrity": "sha512-q7Z71n3i4X0R9xthAryBdNGVGAO2R5X+/xXpmKeuPMrteg+W2U8VusTKV3YiJbXZwKsOlFlHe+go6uSNjfxrZw==",
       "dev": true,
       "requires": {
         "chokidar": "^3.5.0",
@@ -2872,13 +2147,19 @@
     },
     "livereload-js": {
       "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-3.3.2.tgz",
+      "integrity": "sha512-w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA==",
       "dev": true
     },
     "local-access": {
-      "version": "1.1.0"
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/local-access/-/local-access-1.1.0.tgz",
+      "integrity": "sha512-XfegD5pyTAfb+GY6chk283Ox5z8WexG56OvM06RWLpAc/UHozO8X6xAxEkIitZOtsSMM1Yr3DkHgW5W+onLhCw=="
     },
     "magic-string": {
       "version": "0.25.7",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
+      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
       "dev": true,
       "requires": {
         "sourcemap-codec": "^1.4.4"
@@ -2886,17 +2167,25 @@
     },
     "merge-stream": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
       "dev": true
     },
     "mime": {
-      "version": "2.5.2"
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+      "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="
     },
     "min-indent": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
       "dev": true
     },
     "minimatch": {
       "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
       "dev": true,
       "requires": {
         "brace-expansion": "^1.1.7"
@@ -2904,10 +2193,14 @@
     },
     "minimist": {
       "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "dev": true
     },
     "ml-array-max": {
       "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/ml-array-max/-/ml-array-max-1.2.3.tgz",
+      "integrity": "sha512-49YwnLlAf4/E/VyezUz+SNfSBhPE8JTahxRPuyM9S9Uv+ft5x0C8A4trtkDgrttMxoxbhudTA1yg8zgJZaYtpA==",
       "dev": true,
       "requires": {
         "is-any-array": "^1.0.0"
@@ -2915,6 +2208,8 @@
     },
     "ml-array-min": {
       "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/ml-array-min/-/ml-array-min-1.2.2.tgz",
+      "integrity": "sha512-yidQcOHFaGEuVr6FcwAn+QvKXJv1Lxel5fyKrO+aXGJGp97Mt+p8r21WYtikS/PTVbxdSrliQ0UK4wSHYHHgzQ==",
       "dev": true,
       "requires": {
         "is-any-array": "^1.0.0"
@@ -2922,6 +2217,8 @@
     },
     "ml-array-rescale": {
       "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ml-array-rescale/-/ml-array-rescale-1.3.5.tgz",
+      "integrity": "sha512-czK+faN7kYrF48SgVQeXGkxUjDEas6BA4EzF4jJNh8UEtzpSvHW3RllZCJCCyrAqeFc+Y/LhgYUzuHFpevM3qA==",
       "dev": true,
       "requires": {
         "is-any-array": "^1.0.0",
@@ -2939,14 +2236,20 @@
       }
     },
     "mri": {
-      "version": "1.1.6"
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.6.tgz",
+      "integrity": "sha512-oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ=="
     },
     "normalize-path": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true
     },
     "once": {
       "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
       "dev": true,
       "requires": {
         "wrappy": "1"
@@ -2954,10 +2257,14 @@
     },
     "opts": {
       "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/opts/-/opts-2.0.2.tgz",
+      "integrity": "sha512-k41FwbcLnlgnFh69f4qdUfvDQ+5vaSDnVPFI/y5XuhKRq97EnVVneO9F1ESVCdiVu4fCS2L8usX3mU331hB7pg==",
       "dev": true
     },
     "parent-module": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
       "requires": {
         "callsites": "^3.0.0"
@@ -2965,27 +2272,38 @@
     },
     "path-is-absolute": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "dev": true
     },
     "path-parse": {
       "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
     "picomatch": {
       "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
       "dev": true
     },
     "prettier": {
       "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz",
+      "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==",
       "dev": true
     },
     "prettier-plugin-svelte": {
       "version": "2.2.0",
-      "dev": true,
-      "requires": {}
+      "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.2.0.tgz",
+      "integrity": "sha512-Xdmqgr71tAuMqqzNCK52/v94g/Yv7V7lz+nmbO9NEA+9ol15VV3uUHOfydMNOo3SWvFaVlBcp947ebEaMWqVfQ==",
+      "dev": true
     },
     "randombytes": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
       "requires": {
         "safe-buffer": "^5.1.0"
@@ -2993,6 +2311,8 @@
     },
     "readdirp": {
       "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
       "dev": true,
       "requires": {
         "picomatch": "^2.2.1"
@@ -3000,10 +2320,14 @@
     },
     "require-relative": {
       "version": "0.8.7",
+      "resolved": "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz",
+      "integrity": "sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=",
       "dev": true
     },
     "resolve": {
       "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
       "dev": true,
       "requires": {
         "is-core-module": "^2.2.0",
@@ -3012,10 +2336,14 @@
     },
     "resolve-from": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
     "rollup": {
       "version": "2.44.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.44.0.tgz",
+      "integrity": "sha512-rGSF4pLwvuaH/x4nAS+zP6UNn5YUDWf/TeEU5IoXSZKBbKRNTCI3qMnYXKZgrC0D2KzS2baiOZt1OlqhMu5rnQ==",
       "dev": true,
       "requires": {
         "fsevents": "~2.3.1"
@@ -3023,6 +2351,8 @@
     },
     "rollup-plugin-css-only": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-css-only/-/rollup-plugin-css-only-3.1.0.tgz",
+      "integrity": "sha512-TYMOE5uoD76vpj+RTkQLzC9cQtbnJNktHPB507FzRWBVaofg7KhIqq1kGbcVOadARSozWF883Ho9KpSPKH8gqA==",
       "dev": true,
       "requires": {
         "@rollup/pluginutils": "4"
@@ -3030,6 +2360,8 @@
       "dependencies": {
         "@rollup/pluginutils": {
           "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.1.0.tgz",
+          "integrity": "sha512-TrBhfJkFxA+ER+ew2U2/fHbebhLT/l/2pRk0hfj9KusXUuRXd2v0R58AfaZK9VXDQ4TogOSEmICVrQAA3zFnHQ==",
           "dev": true,
           "requires": {
             "estree-walker": "^2.0.1",
@@ -3040,6 +2372,8 @@
     },
     "rollup-plugin-livereload": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-livereload/-/rollup-plugin-livereload-2.0.0.tgz",
+      "integrity": "sha512-oC/8NqumGYuphkqrfszOHUUIwzKsaHBICw6QRwT5uD07gvePTS+HW+GFwu6f9K8W02CUuTvtIM9AWJrbj4wE1A==",
       "dev": true,
       "requires": {
         "livereload": "^0.9.1"
@@ -3047,6 +2381,8 @@
     },
     "rollup-plugin-svelte": {
       "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-svelte/-/rollup-plugin-svelte-7.1.0.tgz",
+      "integrity": "sha512-vopCUq3G+25sKjwF5VilIbiY6KCuMNHP1PFvx2Vr3REBNMDllKHFZN2B9jwwC+MqNc3UPKkjXnceLPEjTjXGXg==",
       "dev": true,
       "requires": {
         "require-relative": "^0.8.7",
@@ -3055,6 +2391,8 @@
     },
     "rollup-plugin-terser": {
       "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz",
+      "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.10.4",
@@ -3065,6 +2403,8 @@
     },
     "rollup-pluginutils": {
       "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
+      "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
       "dev": true,
       "requires": {
         "estree-walker": "^0.6.1"
@@ -3072,25 +2412,35 @@
       "dependencies": {
         "estree-walker": {
           "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
+          "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
           "dev": true
         }
       }
     },
     "sade": {
       "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/sade/-/sade-1.7.4.tgz",
+      "integrity": "sha512-y5yauMD93rX840MwUJr7C1ysLFBgMspsdTo4UVrDg3fXDvtwOyIqykhVAAm6fk/3au77773itJStObgK+LKaiA==",
       "requires": {
         "mri": "^1.1.0"
       }
     },
     "safe-buffer": {
       "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
       "dev": true
     },
     "semiver": {
-      "version": "1.1.0"
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/semiver/-/semiver-1.1.0.tgz",
+      "integrity": "sha512-QNI2ChmuioGC1/xjyYwyZYADILWyW6AmS1UH6gDj/SFUUUS4MBAWs/7mxnkRPc/F4iHezDP+O8t0dO8WHiEOdg=="
     },
     "serialize-javascript": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+      "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
       "dev": true,
       "requires": {
         "randombytes": "^2.1.0"
@@ -3098,6 +2448,8 @@
     },
     "sirv": {
       "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.11.tgz",
+      "integrity": "sha512-SR36i3/LSWja7AJNRBz4fF/Xjpn7lQFI30tZ434dIy+bitLYSP+ZEenHg36i23V2SGEz+kqjksg0uOGZ5LPiqg==",
       "requires": {
         "@polka/url": "^1.0.0-next.9",
         "mime": "^2.3.1",
@@ -3106,6 +2458,8 @@
     },
     "sirv-cli": {
       "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/sirv-cli/-/sirv-cli-1.0.11.tgz",
+      "integrity": "sha512-L8NILoRSBd38VcfFcERYCaVCnWPBLo9G6u/a37UJ8Ysv4DfjizMbFBcM+SswNnndJienhR6qy8KFuAEaeL4g8Q==",
       "requires": {
         "console-clear": "^1.1.0",
         "get-port": "^3.2.0",
@@ -3119,10 +2473,14 @@
     },
     "source-map": {
       "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
       "dev": true
     },
     "source-map-support": {
       "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
@@ -3131,16 +2489,22 @@
       "dependencies": {
         "source-map": {
           "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
     },
     "sourcemap-codec": {
       "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+      "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
       "dev": true
     },
     "strip-indent": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
       "dev": true,
       "requires": {
         "min-indent": "^1.0.0"
@@ -3148,6 +2512,8 @@
     },
     "supports-color": {
       "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
       "requires": {
         "has-flag": "^3.0.0"
@@ -3155,10 +2521,14 @@
     },
     "svelte": {
       "version": "3.37.0",
+      "resolved": "https://registry.npmjs.org/svelte/-/svelte-3.37.0.tgz",
+      "integrity": "sha512-TRF30F4W4+d+Jr2KzUUL1j8Mrpns/WM/WacxYlo5MMb2E5Qy2Pk1Guj6GylxsW9OnKQl1tnF8q3hG/hQ3h6VUA==",
       "dev": true
     },
     "svelte-check": {
       "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-1.3.0.tgz",
+      "integrity": "sha512-FMLZr/wv9S0MzCALo9BlHYyu1wlgXRdHWSjXDiknhraL9Igm0EVb00/tR6CMJ7j4q2kphRIEYcSRQJ7AtXHk+g==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
@@ -3173,6 +2543,8 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
             "color-convert": "^2.0.1"
@@ -3180,6 +2552,8 @@
         },
         "chalk": {
           "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -3188,6 +2562,8 @@
         },
         "color-convert": {
           "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
             "color-name": "~1.1.4"
@@ -3195,14 +2571,20 @@
         },
         "color-name": {
           "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -3210,23 +2592,10 @@
         }
       }
     },
-<<<<<<< HEAD
-    "svelte-collapse": {
-      "version": "0.0.2",
-      "dev": true
-    },
-    "svelte-collapsible": {
-      "version": "0.0.8",
-      "dev": true,
-      "requires": {
-        "sirv-cli": "^1.0.0",
-        "svelte-collapse": "0.0.2"
-      }
-    },
-=======
->>>>>>> main
     "svelte-preprocess": {
       "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.7.0.tgz",
+      "integrity": "sha512-iNrY4YGqi0LD2e6oT9YbdSzOKntxk8gmzfqso1z/lUJOZh4o6fyIqkirmiZ8/dDJFqtIE1spVgDFWgkfhLEYlw==",
       "dev": true,
       "requires": {
         "@types/pug": "^2.0.4",
@@ -3237,6 +2606,8 @@
     },
     "terser": {
       "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.6.1.tgz",
+      "integrity": "sha512-yv9YLFQQ+3ZqgWCUk+pvNJwgUTdlIxUk1WTN+RnaFJe2L7ipG2csPT0ra2XRm7Cs8cxN7QXmK1rFzEwYEQkzXw==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -3245,34 +2616,47 @@
       }
     },
     "tinydate": {
-      "version": "1.3.0"
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/tinydate/-/tinydate-1.3.0.tgz",
+      "integrity": "sha512-7cR8rLy2QhYHpsBDBVYnnWXm8uRTr38RoZakFSW7Bs7PzfMPNZthuMLkwqZv7MTu8lhQ91cOFYS5a7iFj2oR3w=="
     },
     "to-regex-range": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
       "requires": {
         "is-number": "^7.0.0"
       }
     },
     "totalist": {
-      "version": "1.1.0"
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
+      "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g=="
     },
     "tslib": {
       "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+      "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==",
       "dev": true
     },
     "typescript": {
       "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz",
+      "integrity": "sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==",
       "dev": true
     },
     "wrappy": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
       "dev": true
     },
     "ws": {
       "version": "7.4.4",
-      "dev": true,
-      "requires": {}
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
+      "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==",
+      "dev": true
     }
   }
 }

From d706bac8b4558a2a7ddc619a8eecd48e2a33b495 Mon Sep 17 00:00:00 2001
From: ST John <st--@users.noreply.github.com>
Date: Mon, 19 Apr 2021 22:26:44 +0100
Subject: [PATCH 04/24] minor update

---
 src/App.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index b19e071..22abb9d 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -102,7 +102,7 @@ Future thoughts:
 
   //$: samples = sampleMvn(means, covSqrt, $vs);
   let frameIdx = 0;
-  let numFrames = 20;
+  let numFrames = 45;
   $: sampleFrames = sampleMvnTrajectory(means, covSqrt, $vs, numFrames);
   $: samples = sampleFrames[frameIdx];
 
@@ -113,7 +113,7 @@ Future thoughts:
   }
 
   let animationInterval;
-  let animationDelay = 100;
+  let animationDelay = 50;
   $: {
     clearInterval(animationInterval);
     setInterval(updateFrameIdx, animationDelay);
@@ -168,7 +168,7 @@ Future thoughts:
         observations on which to condition the Gaussian process by
         <strong>clicking</strong>
         anywhere in the plot; these observations are drawn as black circles &#9899;.
-        Clicking on an observation removes it again.
+        To remove an observation again, click on it.
         <small
           ><em>Note:</em> Two observations too close to each other can lead to numerical
           issues and long compute times. If the app seems to hang, reload the page

From 571174d58aaa0dedc16639c7691114fda12a0c98 Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:01:37 +0300
Subject: [PATCH 05/24] update dependencies

---
 package-lock.json                             | 174 +++++++++---------
 package.json                                  |  18 +-
 ...D.svelte => PlotCovarianceFunction.svelte} |   0
 3 files changed, 101 insertions(+), 91 deletions(-)
 rename src/{KernelTwoD.svelte => PlotCovarianceFunction.svelte} (100%)

diff --git a/package-lock.json b/package-lock.json
index 4e571e3..cab2627 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
         "@rollup/plugin-commonjs": "^19.0.0",
         "@rollup/plugin-node-resolve": "^13.0.0",
         "@rollup/plugin-typescript": "^8.0.0",
-        "@tsconfig/svelte": "^1.0.13",
+        "@tsconfig/svelte": "^2.0.1",
         "@types/d3-array": "^2.12.1",
         "@types/d3-contour": "^2.0.0",
         "@types/d3-geo": "^2.0.0",
@@ -23,23 +23,23 @@
         "@types/d3-scale-chromatic": "^2.0.0",
         "@types/katex": "^0.11.0",
         "d3-array": "latest",
-        "d3-contour": "^2.0.0",
-        "d3-geo": "^2.0.1",
-        "d3-random": "^2.2.2",
+        "d3-contour": "^3.0.1",
+        "d3-geo": "^3.0.1",
+        "d3-random": "^3.0.1",
         "d3-scale": "latest",
-        "d3-scale-chromatic": "^2.0.0",
+        "d3-scale-chromatic": "^3.0.0",
         "katex": "^0.13.11",
         "ml-matrix": "latest",
-        "prettier": "^2.3.0",
+        "prettier": "^2.3.1",
         "prettier-plugin-svelte": "^2.3.0",
-        "rollup": "^2.50.4",
+        "rollup": "^2.51.1",
         "rollup-plugin-css-only": "^3.1.0",
         "rollup-plugin-livereload": "^2.0.0",
         "rollup-plugin-svelte": "^7.0.0",
         "rollup-plugin-terser": "^7.0.0",
         "svelte": "^3.38.2",
-        "svelte-check": "^2.0.0",
-        "svelte-collapsible": "^0.0.9",
+        "svelte-check": "^2.1.0",
+        "svelte-collapsible": "^0.1.1",
         "svelte-preprocess": "^4.7.3",
         "tslib": "^2.0.0",
         "typescript": "^4.3.2"
@@ -151,9 +151,9 @@
       "dev": true
     },
     "node_modules/@tsconfig/svelte": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/@tsconfig/svelte/-/svelte-1.0.13.tgz",
-      "integrity": "sha512-5lYJP45Xllo4yE/RUBccBT32eBlRDbqN8r1/MIvQbKxW3aFqaYPCNgm8D5V20X4ShHcwvYWNlKg3liDh1MlBoA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@tsconfig/svelte/-/svelte-2.0.1.tgz",
+      "integrity": "sha512-aqkICXbM1oX5FfgZd2qSSAGdyo/NRxjWCamxoyi3T8iVQnzGge19HhDYzZ6NrVOW7bhcWNSq9XexWFtMzbB24A==",
       "dev": true
     },
     "node_modules/@types/d3-array": {
@@ -434,12 +434,15 @@
       "dev": true
     },
     "node_modules/d3-contour": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-2.0.0.tgz",
-      "integrity": "sha512-9unAtvIaNk06UwqBmvsdHX7CZ+NPDZnn8TtNH1myW93pWJkhsV25JcgnYAu0Ck5Veb1DHiCv++Ic5uvJ+h50JA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-3.0.1.tgz",
+      "integrity": "sha512-0Oc4D0KyhwhM7ZL0RMnfGycLN7hxHB8CMmwZ3+H26PWAG0ozNuYG5hXSDNgmP1SgJkQMrlG6cP20HoaSbvcJTQ==",
       "dev": true,
       "dependencies": {
-        "d3-array": "2"
+        "d3-array": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-format": {
@@ -449,12 +452,15 @@
       "dev": true
     },
     "node_modules/d3-geo": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.1.tgz",
-      "integrity": "sha512-M6yzGbFRfxzNrVhxDJXzJqSLQ90q1cCyb3EWFZ1LF4eWOBYxFypw7I/NFVBNXKNqxv1bqLathhYvdJ6DC+th3A==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.0.1.tgz",
+      "integrity": "sha512-Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA==",
       "dev": true,
       "dependencies": {
-        "d3-array": ">=2.5"
+        "d3-array": "2.5.0 - 3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-interpolate": {
@@ -467,10 +473,13 @@
       }
     },
     "node_modules/d3-random": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-2.2.2.tgz",
-      "integrity": "sha512-0D9P8TRj6qDAtHhRQn6EfdOtHMfsUWanl3yb/84C4DqpZ+VsgfI5iTVRNRbELCfNvRfpMr8OrqqUTQ6ANGCijw==",
-      "dev": true
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
+      "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-scale": {
       "version": "3.2.4",
@@ -486,13 +495,16 @@
       }
     },
     "node_modules/d3-scale-chromatic": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-2.0.0.tgz",
-      "integrity": "sha512-LLqy7dJSL8yDy7NRmf6xSlsFZ6zYvJ4BcWFE4zBrOPnQERv9zj24ohnXKRbyi9YHnYV+HN1oEO3iFK971/gkzA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz",
+      "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==",
       "dev": true,
       "dependencies": {
-        "d3-color": "1 - 2",
-        "d3-interpolate": "1 - 2"
+        "d3-color": "1 - 3",
+        "d3-interpolate": "1 - 3"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/d3-time": {
@@ -1007,9 +1019,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz",
-      "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.1.tgz",
+      "integrity": "sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA==",
       "dev": true,
       "bin": {
         "prettier": "bin-prettier.js"
@@ -1075,9 +1087,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "2.50.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.50.4.tgz",
-      "integrity": "sha512-mBQa9O6bdqur7a6R+TXcbdYgfO2arXlDG+rSrWfwAvsiumpJjD4OS23R9QuhItuz8ysWb8mZ91CFFDQUhJY+8Q==",
+      "version": "2.51.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.51.1.tgz",
+      "integrity": "sha512-8xfDbAtBleXotb6qKEHWuo/jkn94a9dVqGc7Rwl3sqspCVlnCfbRek7ldhCARSi7h32H0xR4QThm1t9zHN+3uw==",
       "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -1302,9 +1314,9 @@
       }
     },
     "node_modules/svelte-check": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-2.0.0.tgz",
-      "integrity": "sha512-72xHHZG2DUgt1QzKKKvirzvYYDKLfK5L2lJsCCbW87fd383VqZJ08RLKNf6pfEZQJl8yk2rUsTU6krgntB9TXQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-2.1.0.tgz",
+      "integrity": "sha512-kKLXkFt0XZTn+O1fnilGTQ1SFLsOFF+lXp1YjPfeN9nX+Y3ZpELtZSQCkbuK6HMkWugFvsOM17FCOSa1mfrEFA==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
@@ -1389,19 +1401,18 @@
       }
     },
     "node_modules/svelte-collapse": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/svelte-collapse/-/svelte-collapse-0.0.2.tgz",
-      "integrity": "sha512-9RCiMOiHCOBC1Ah5M7u0STG7HhPBZPwTcGo9iXXQEKWXsLdIVFigVXARr4aG7CwwEXqT2gioVT8hjscGDIh7WQ==",
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/svelte-collapse/-/svelte-collapse-0.0.4.tgz",
+      "integrity": "sha512-TXG836Uhn6SzDFsB3PIHBTormEl45Eb0denD34nYz1zM4PeArh5OYN6G3ZGmMHpG7DAHhRaEX5ikDpHfk2JNcA==",
       "dev": true
     },
     "node_modules/svelte-collapsible": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/svelte-collapsible/-/svelte-collapsible-0.0.9.tgz",
-      "integrity": "sha512-GVLnPSuh2P1JaYpk/KpONakwSrr11577DyjRsHZFqLEq0kTtZWxm2qN5jM4k0VA1DDDrlkrH281NGpmkA9u+YQ==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/svelte-collapsible/-/svelte-collapsible-0.1.1.tgz",
+      "integrity": "sha512-Kos33wOf3zAaJKPY0ZFlOxXKBhUSQM+XSojKTd7g/TNdQWwKubmSUoIKf0H8X60KTcwVsWtWSzniBPFtUCHruQ==",
       "dev": true,
       "dependencies": {
-        "sirv-cli": "^1.0.0",
-        "svelte-collapse": "0.0.2"
+        "svelte-collapse": "^0.0.4"
       }
     },
     "node_modules/svelte-preprocess": {
@@ -1651,9 +1662,9 @@
       }
     },
     "@tsconfig/svelte": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/@tsconfig/svelte/-/svelte-1.0.13.tgz",
-      "integrity": "sha512-5lYJP45Xllo4yE/RUBccBT32eBlRDbqN8r1/MIvQbKxW3aFqaYPCNgm8D5V20X4ShHcwvYWNlKg3liDh1MlBoA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@tsconfig/svelte/-/svelte-2.0.1.tgz",
+      "integrity": "sha512-aqkICXbM1oX5FfgZd2qSSAGdyo/NRxjWCamxoyi3T8iVQnzGge19HhDYzZ6NrVOW7bhcWNSq9XexWFtMzbB24A==",
       "dev": true
     },
     "@types/d3-array": {
@@ -1905,12 +1916,12 @@
       "dev": true
     },
     "d3-contour": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-2.0.0.tgz",
-      "integrity": "sha512-9unAtvIaNk06UwqBmvsdHX7CZ+NPDZnn8TtNH1myW93pWJkhsV25JcgnYAu0Ck5Veb1DHiCv++Ic5uvJ+h50JA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-3.0.1.tgz",
+      "integrity": "sha512-0Oc4D0KyhwhM7ZL0RMnfGycLN7hxHB8CMmwZ3+H26PWAG0ozNuYG5hXSDNgmP1SgJkQMrlG6cP20HoaSbvcJTQ==",
       "dev": true,
       "requires": {
-        "d3-array": "2"
+        "d3-array": "2 - 3"
       }
     },
     "d3-format": {
@@ -1920,12 +1931,12 @@
       "dev": true
     },
     "d3-geo": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.1.tgz",
-      "integrity": "sha512-M6yzGbFRfxzNrVhxDJXzJqSLQ90q1cCyb3EWFZ1LF4eWOBYxFypw7I/NFVBNXKNqxv1bqLathhYvdJ6DC+th3A==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.0.1.tgz",
+      "integrity": "sha512-Wt23xBych5tSy9IYAM1FR2rWIBFWa52B/oF/GYe5zbdHrg08FU8+BuI6X4PvTwPDdqdAdq04fuWJpELtsaEjeA==",
       "dev": true,
       "requires": {
-        "d3-array": ">=2.5"
+        "d3-array": "2.5.0 - 3"
       }
     },
     "d3-interpolate": {
@@ -1938,9 +1949,9 @@
       }
     },
     "d3-random": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-2.2.2.tgz",
-      "integrity": "sha512-0D9P8TRj6qDAtHhRQn6EfdOtHMfsUWanl3yb/84C4DqpZ+VsgfI5iTVRNRbELCfNvRfpMr8OrqqUTQ6ANGCijw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
+      "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
       "dev": true
     },
     "d3-scale": {
@@ -1957,13 +1968,13 @@
       }
     },
     "d3-scale-chromatic": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-2.0.0.tgz",
-      "integrity": "sha512-LLqy7dJSL8yDy7NRmf6xSlsFZ6zYvJ4BcWFE4zBrOPnQERv9zj24ohnXKRbyi9YHnYV+HN1oEO3iFK971/gkzA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz",
+      "integrity": "sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==",
       "dev": true,
       "requires": {
-        "d3-color": "1 - 2",
-        "d3-interpolate": "1 - 2"
+        "d3-color": "1 - 3",
+        "d3-interpolate": "1 - 3"
       }
     },
     "d3-time": {
@@ -2380,9 +2391,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz",
-      "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.1.tgz",
+      "integrity": "sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA==",
       "dev": true
     },
     "prettier-plugin-svelte": {
@@ -2433,9 +2444,9 @@
       "dev": true
     },
     "rollup": {
-      "version": "2.50.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.50.4.tgz",
-      "integrity": "sha512-mBQa9O6bdqur7a6R+TXcbdYgfO2arXlDG+rSrWfwAvsiumpJjD4OS23R9QuhItuz8ysWb8mZ91CFFDQUhJY+8Q==",
+      "version": "2.51.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.51.1.tgz",
+      "integrity": "sha512-8xfDbAtBleXotb6qKEHWuo/jkn94a9dVqGc7Rwl3sqspCVlnCfbRek7ldhCARSi7h32H0xR4QThm1t9zHN+3uw==",
       "dev": true,
       "requires": {
         "fsevents": "~2.3.1"
@@ -2618,9 +2629,9 @@
       "dev": true
     },
     "svelte-check": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-2.0.0.tgz",
-      "integrity": "sha512-72xHHZG2DUgt1QzKKKvirzvYYDKLfK5L2lJsCCbW87fd383VqZJ08RLKNf6pfEZQJl8yk2rUsTU6krgntB9TXQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/svelte-check/-/svelte-check-2.1.0.tgz",
+      "integrity": "sha512-kKLXkFt0XZTn+O1fnilGTQ1SFLsOFF+lXp1YjPfeN9nX+Y3ZpELtZSQCkbuK6HMkWugFvsOM17FCOSa1mfrEFA==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
@@ -2686,19 +2697,18 @@
       }
     },
     "svelte-collapse": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/svelte-collapse/-/svelte-collapse-0.0.2.tgz",
-      "integrity": "sha512-9RCiMOiHCOBC1Ah5M7u0STG7HhPBZPwTcGo9iXXQEKWXsLdIVFigVXARr4aG7CwwEXqT2gioVT8hjscGDIh7WQ==",
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/svelte-collapse/-/svelte-collapse-0.0.4.tgz",
+      "integrity": "sha512-TXG836Uhn6SzDFsB3PIHBTormEl45Eb0denD34nYz1zM4PeArh5OYN6G3ZGmMHpG7DAHhRaEX5ikDpHfk2JNcA==",
       "dev": true
     },
     "svelte-collapsible": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/svelte-collapsible/-/svelte-collapsible-0.0.9.tgz",
-      "integrity": "sha512-GVLnPSuh2P1JaYpk/KpONakwSrr11577DyjRsHZFqLEq0kTtZWxm2qN5jM4k0VA1DDDrlkrH281NGpmkA9u+YQ==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/svelte-collapsible/-/svelte-collapsible-0.1.1.tgz",
+      "integrity": "sha512-Kos33wOf3zAaJKPY0ZFlOxXKBhUSQM+XSojKTd7g/TNdQWwKubmSUoIKf0H8X60KTcwVsWtWSzniBPFtUCHruQ==",
       "dev": true,
       "requires": {
-        "sirv-cli": "^1.0.0",
-        "svelte-collapse": "0.0.2"
+        "svelte-collapse": "^0.0.4"
       }
     },
     "svelte-preprocess": {
diff --git a/package.json b/package.json
index 274014f..7c438e0 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "@rollup/plugin-commonjs": "^19.0.0",
     "@rollup/plugin-node-resolve": "^13.0.0",
     "@rollup/plugin-typescript": "^8.0.0",
-    "@tsconfig/svelte": "^1.0.13",
+    "@tsconfig/svelte": "^2.0.1",
     "@types/d3-array": "^2.12.1",
     "@types/d3-contour": "^2.0.0",
     "@types/d3-geo": "^2.0.0",
@@ -21,23 +21,23 @@
     "@types/d3-scale-chromatic": "^2.0.0",
     "@types/katex": "^0.11.0",
     "d3-array": "latest",
-    "d3-contour": "^2.0.0",
-    "d3-geo": "^2.0.1",
-    "d3-random": "^2.2.2",
+    "d3-contour": "^3.0.1",
+    "d3-geo": "^3.0.1",
+    "d3-random": "^3.0.1",
     "d3-scale": "latest",
-    "d3-scale-chromatic": "^2.0.0",
+    "d3-scale-chromatic": "^3.0.0",
     "katex": "^0.13.11",
     "ml-matrix": "latest",
-    "prettier": "^2.3.0",
+    "prettier": "^2.3.1",
     "prettier-plugin-svelte": "^2.3.0",
-    "rollup": "^2.50.4",
+    "rollup": "^2.51.1",
     "rollup-plugin-css-only": "^3.1.0",
     "rollup-plugin-livereload": "^2.0.0",
     "rollup-plugin-svelte": "^7.0.0",
     "rollup-plugin-terser": "^7.0.0",
     "svelte": "^3.38.2",
-    "svelte-check": "^2.0.0",
-    "svelte-collapsible": "^0.0.9",
+    "svelte-check": "^2.1.0",
+    "svelte-collapsible": "^0.1.1",
     "svelte-preprocess": "^4.7.3",
     "tslib": "^2.0.0",
     "typescript": "^4.3.2"
diff --git a/src/KernelTwoD.svelte b/src/PlotCovarianceFunction.svelte
similarity index 100%
rename from src/KernelTwoD.svelte
rename to src/PlotCovarianceFunction.svelte

From ae66beba592650f38e246ff3b8708b4e175e6f55 Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:29:22 +0300
Subject: [PATCH 06/24] finish rename

---
 src/App.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index bc3e63d..0c6cd2f 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -31,8 +31,8 @@ Future thoughts:
   import PlotMarginals from "./PlotMarginals.svelte";
   import PlotKernelSlices from "./PlotKernelSlices.svelte";
   import PlotBivariateCovariance from "./PlotBivariateCovariance.svelte";
+  import PlotCovarianceFunction from "./PlotCovarianceFunction.svelte";
   import RandomSample from "./RandomSample.svelte";
-  import KernelTwoD from "./KernelTwoD.svelte";
   import Animation from "./Animation.svelte";
   import ConfigModel from "./ConfigModel.svelte";
   import ConfigPlot from "./ConfigPlot.svelte";
@@ -253,7 +253,7 @@ Future thoughts:
   <CollapsibleCard open={true}>
     <h3 slot="header">&#187; Full covariance</h3>
     <div slot="body" class="fullcovchart">
-      <KernelTwoD {covMat} />
+      <PlotCovarianceFunction {covMat} />
     </div>
   </CollapsibleCard>
 

From 86603cf6675b5bd8e4c36b8885ebde41e70a9b93 Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:29:52 +0300
Subject: [PATCH 07/24] fix padding to match PlotMarginals

---
 src/PlotCovarianceFunction.svelte | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/PlotCovarianceFunction.svelte b/src/PlotCovarianceFunction.svelte
index 3254fd3..90545be 100644
--- a/src/PlotCovarianceFunction.svelte
+++ b/src/PlotCovarianceFunction.svelte
@@ -15,9 +15,8 @@
   let width = 300;
   let height = 300;
 
-  // const padding = { top: 25, right: 40, bottom: 40, left: 25 };
-  const padding = { top: 25, bottom: 45, left: 50 };
-  padding.right = padding.top + padding.bottom - padding.left; // 20
+  const padding = { top: 25, right: 15, left: 50 }; // to match PlotMarginals
+  padding.bottom = padding.left + padding.right - padding.top; // to square up
 
   $: xTicks = size > 180 ? linspace(0, 6, 7) : linspace(0, 6, 3);
   $: yTicks = xTicks;

From b810b15b7aa02b484701e7e7fafdc6797a774593 Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:30:12 +0300
Subject: [PATCH 08/24] handle Shift modifier in mousemove

---
 src/PlotCovarianceFunction.svelte | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/PlotCovarianceFunction.svelte b/src/PlotCovarianceFunction.svelte
index 90545be..e90bb90 100644
--- a/src/PlotCovarianceFunction.svelte
+++ b/src/PlotCovarianceFunction.svelte
@@ -75,8 +75,13 @@
     const pt = getSVGpoint(svg, event);
     const newX = xScale.invert(pt.x);
     const newY = yScale.invert(pt.y);
-    x1.set(newX);
-    x2.set(newY);
+    if (event.shiftKey) {
+      x1.set(newX);
+      x2.set(newY);
+    } else {
+      x1.set(newY);
+      x2.set(newX);
+    }
   }
 </script>
 

From a2b37ddbbd9ccecc4cda7a890ed21f4ab498a80c Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:30:28 +0300
Subject: [PATCH 09/24] remove unused css

---
 src/PlotCovarianceFunction.svelte | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/PlotCovarianceFunction.svelte b/src/PlotCovarianceFunction.svelte
index e90bb90..ccc6da9 100644
--- a/src/PlotCovarianceFunction.svelte
+++ b/src/PlotCovarianceFunction.svelte
@@ -113,22 +113,4 @@
     width: 100%;
     height: 100%;
   }
-
-  circle {
-    fill: orange;
-    fill-opacity: 0.6;
-    stroke: rgba(0, 0, 0, 0.5);
-  }
-
-  .path-line {
-    fill: none;
-    stroke: rgb(0, 100, 100);
-    stroke-linejoin: round;
-    stroke-linecap: round;
-    stroke-width: 2;
-  }
-
-  .path-area {
-    fill: rgba(0, 100, 100, 0.2);
-  }
 </style>

From bf897749c7a1713b9613665c411917740cfcf7bf Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:31:38 +0300
Subject: [PATCH 10/24] add ConfigPlot option to hide fullcov

---
 src/App.svelte        | 15 +++++++++------
 src/ConfigPlot.svelte |  4 ++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 0c6cd2f..72ce199 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -63,6 +63,7 @@ Future thoughts:
     confidence: true,
     samples: true,
     marginals: true,
+    fullcov: true,
   };
 
   let num_grid = 150;
@@ -250,12 +251,14 @@ Future thoughts:
     </div>
   </div>
 
-  <CollapsibleCard open={true}>
-    <h3 slot="header">&#187; Full covariance</h3>
-    <div slot="body" class="fullcovchart">
-      <PlotCovarianceFunction {covMat} />
-    </div>
-  </CollapsibleCard>
+  {#if plotProps.fullcov}
+    <CollapsibleCard open={true}>
+      <h3 slot="header">&#187; Full covariance</h3>
+      <div slot="body" class="fullcovchart">
+        <PlotCovarianceFunction {covMat} />
+      </div>
+    </CollapsibleCard>
+  {/if}
 
   <CollapsibleCard open={true}>
     <h3 slot="header">&#187; Visualization settings</h3>
diff --git a/src/ConfigPlot.svelte b/src/ConfigPlot.svelte
index d5dcb1a..61ecf15 100644
--- a/src/ConfigPlot.svelte
+++ b/src/ConfigPlot.svelte
@@ -24,6 +24,10 @@
   ><input type="checkbox" bind:checked={plotProps.marginals} />Plot marginal
   distributions of <Katex math="f(x_1), \, f(x_2)" /></label
 >
+<label
+  ><input type="checkbox" bind:checked={plotProps.fullcov} />Visualize full
+  covariance function <Katex math={"\\operatorname{cov}(f(x),f(x'))"} /></label
+>
 <div class="advanced">
   <label>
     Number of evaluation points: {num_grid}

From 542cc0dc5213a1b97eef3505adcb728dfe1d823d Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:32:45 +0300
Subject: [PATCH 11/24] add XIndicatorCross for x1/x2

---
 src/PlotCovarianceFunction.svelte | 14 ++++++++++++++
 src/XIndicatorCross.svelte        | 21 +++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 src/XIndicatorCross.svelte

diff --git a/src/PlotCovarianceFunction.svelte b/src/PlotCovarianceFunction.svelte
index ccc6da9..8e08a91 100644
--- a/src/PlotCovarianceFunction.svelte
+++ b/src/PlotCovarianceFunction.svelte
@@ -9,6 +9,7 @@
   import { linspace } from "./mymath.js";
   import { getSVGpoint } from "./getsvgpoint.js";
   import Axes from "./Axes.svelte";
+  import XIndicatorCross from "./XIndicatorCross.svelte";
   export let covMat;
 
   let svg;
@@ -101,6 +102,19 @@
     {#each contourPaths as contourPath, i}
       <path d={contourPath} style="fill: {color(i)};" />
     {/each}
+
+    <XIndicatorCross
+      {xScale}
+      {yScale}
+      x={$x1}
+      style="stroke: red; stroke-width: 2"
+    />
+    <XIndicatorCross
+      {xScale}
+      {yScale}
+      x={$x2}
+      style="stroke: orange; stroke-width: 2"
+    />
   </svg>
 </div>
 
diff --git a/src/XIndicatorCross.svelte b/src/XIndicatorCross.svelte
new file mode 100644
index 0000000..62d3a76
--- /dev/null
+++ b/src/XIndicatorCross.svelte
@@ -0,0 +1,21 @@
+<script>
+  export let xScale, yScale, x, style;
+
+  $: minX = 0; // xs[0];
+  $: maxX = 6; // xs[xs.length - 1];
+</script>
+
+<line
+  x1={xScale(x)}
+  x2={xScale(x)}
+  y1={yScale(minX)}
+  y2={yScale(maxX)}
+  {style}
+/>
+<line
+  x1={xScale(minX)}
+  x2={xScale(maxX)}
+  y1={yScale(x)}
+  y2={yScale(x)}
+  {style}
+/>

From c7a420ca673cbdcb5cd8dad414ff39cf8c96a745 Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:33:14 +0300
Subject: [PATCH 12/24] make mytransform reactive to xScale/yScale

---
 src/PlotCovarianceFunction.svelte | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/PlotCovarianceFunction.svelte b/src/PlotCovarianceFunction.svelte
index 8e08a91..51acae3 100644
--- a/src/PlotCovarianceFunction.svelte
+++ b/src/PlotCovarianceFunction.svelte
@@ -48,20 +48,23 @@
   const grid = flatCov;
 
   // Converts from grid coordinates (indexes) to screen coordinates (pixels).
-  function mytransform({ type, value, coordinates }) {
-    return {
-      type,
-      value,
-      coordinates: coordinates.map((rings) => {
-        return rings.map((points) => {
-          return points.map(([x, y]) => [
-            xScale((x / covMat.rows) * 6 + 0),
-            yScale((y / covMat.rows) * 6 + 0),
-          ]);
-        });
-      }),
+  function createTransform(xScale, yScale) {
+    return ({ type, value, coordinates }) => {
+      return {
+        type,
+        value,
+        coordinates: coordinates.map((rings) => {
+          return rings.map((points) => {
+            return points.map(([x, y]) => [
+              xScale((x / covMat.rows) * 6 + 0),
+              yScale((y / covMat.rows) * 6 + 0),
+            ]);
+          });
+        }),
+      };
     };
   }
+  $: mytransform = createTransform(xScale, yScale);
   $: contourPaths = contourGeo.map(mytransform).map(geoPath());
   $: console.log(contourPaths);
 

From 57f676eb53c15c26b66eea7b79860da6cd246750 Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:33:38 +0300
Subject: [PATCH 13/24] set width/height of fullcovchart to width of marginals
 plot

---
 src/App.svelte | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 72ce199..b70d4a3 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -126,6 +126,8 @@ Future thoughts:
   $: covProps = covEllipse(covY1Y2);
 
   let points = [];
+
+  let widthPlotMarginals;
 </script>
 
 <div>
@@ -233,7 +235,11 @@ Future thoughts:
       <div class="chart" style="grid-area: bicovmatrix;">
         <ShowBivariateCovarianceMatrix {atX1} {atX2} />
       </div>
-      <div class="chart" style="grid-area: marginals;">
+      <div
+        class="chart"
+        style="grid-area: marginals;"
+        bind:clientWidth={widthPlotMarginals}
+      >
         <PlotMarginals
           {xs}
           {means}
@@ -254,7 +260,11 @@ Future thoughts:
   {#if plotProps.fullcov}
     <CollapsibleCard open={true}>
       <h3 slot="header">&#187; Full covariance</h3>
-      <div slot="body" class="fullcovchart">
+      <div
+        slot="body"
+        class="fullcovchart"
+        style="width: {widthPlotMarginals}px; height: {widthPlotMarginals}px;"
+      >
         <PlotCovarianceFunction {covMat} />
       </div>
     </CollapsibleCard>
@@ -347,8 +357,6 @@ Future thoughts:
     /* background-color: #fafafa; */
   }
   .fullcovchart {
-    min-width: 400px;
-    min-height: 400px;
     background-color: #fafafa;
   }
   .squarechart {

From 0c2af1efef10b1579f727c09e5939ceea579dea2 Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:35:01 +0300
Subject: [PATCH 14/24] display quickfixes for configuration

---
 src/ConfigModel.svelte | 28 ++++++++++++++++------------
 src/ConfigPlot.svelte  |  3 +++
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/ConfigModel.svelte b/src/ConfigModel.svelte
index 5cec552..6a45877 100644
--- a/src/ConfigModel.svelte
+++ b/src/ConfigModel.svelte
@@ -52,19 +52,23 @@
     <div class="flexelement">
       {#if kernelCombination === ""}
         <!-- simple kernel -->
-        <button
-          on:click={(_event) => {
-            kernelCombination = "+";
-          }}
-          title="add second kernel"><strong>&plus;</strong></button
-        >/<button
-          on:click={(_event) => {
-            kernelCombination = "*";
-          }}
-          title="multiply by second kernel"><strong>&times;</strong></button
-        >
+        <div style="margin-right: 1em;">
+          <button
+            on:click={(_event) => {
+              kernelCombination = "+";
+            }}
+            title="add second kernel"><strong>&plus;</strong></button
+          >/<button
+            on:click={(_event) => {
+              kernelCombination = "*";
+            }}
+            title="multiply by second kernel"><strong>&times;</strong></button
+          >
+        </div>
       {:else}
-        <strong>{@html kernelCombinationSymbol}</strong>
+        <strong style="margin-right: 1em;"
+          >{@html kernelCombinationSymbol}</strong
+        >
         <select bind:value={kernelSelection2}>
           {#each kernelChoices2 as choice}
             <option value={choice}>
diff --git a/src/ConfigPlot.svelte b/src/ConfigPlot.svelte
index d5dcb1a..0997285 100644
--- a/src/ConfigPlot.svelte
+++ b/src/ConfigPlot.svelte
@@ -36,4 +36,7 @@
   input[type="checkbox"] {
     margin-right: 5px;
   }
+  input[type="range"] {
+    vertical-align: middle;
+  }
 </style>

From 768c71b79193a880773fa413cccb487f758c0056 Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:37:56 +0300
Subject: [PATCH 15/24] div container width/height fix

---
 src/PlotCovarianceFunction.svelte | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/PlotCovarianceFunction.svelte b/src/PlotCovarianceFunction.svelte
index 51acae3..d26c8e5 100644
--- a/src/PlotCovarianceFunction.svelte
+++ b/src/PlotCovarianceFunction.svelte
@@ -91,7 +91,7 @@
 
 <svelte:window on:resize={resize} />
 
-<div>
+<div id="container">
   <svg bind:this={svg} on:mousemove={handleMousemove}>
     <Axes
       {xScale}
@@ -122,9 +122,10 @@
 </div>
 
 <style>
-  div {
-    width: 400px;
-    height: 400px;
+  #container {
+    position: relative;
+    width: 100%;
+    height: 100%;
   }
   svg {
     width: 100%;

From 23acfe1a1c6ddb9124b8170996fe71fa0666a67a Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:38:15 +0300
Subject: [PATCH 16/24] remove logging

---
 src/PlotCovarianceFunction.svelte | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/PlotCovarianceFunction.svelte b/src/PlotCovarianceFunction.svelte
index d26c8e5..e05c1de 100644
--- a/src/PlotCovarianceFunction.svelte
+++ b/src/PlotCovarianceFunction.svelte
@@ -38,7 +38,6 @@
 
   $: contourGenerator = contours().size([covMat.rows, covMat.columns]);
   $: flatCov = covMat.transpose().to1DArray();
-  $: console.log(flatCov);
   let numContours = 30;
   $: contourGeo = linspace(-1, 1, numContours).map((threshold) =>
     contourGenerator.contour(flatCov, threshold)
@@ -66,7 +65,6 @@
   }
   $: mytransform = createTransform(xScale, yScale);
   $: contourPaths = contourGeo.map(mytransform).map(geoPath());
-  $: console.log(contourPaths);
 
   $: color = scaleSequential([numContours, 0], interpolateSpectral);
   onMount(resize);

From 894724da66fd83badbfc77960d65a83f92004ca7 Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:51:55 +0300
Subject: [PATCH 17/24] Axes in front

---
 src/PlotCovarianceFunction.svelte | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/PlotCovarianceFunction.svelte b/src/PlotCovarianceFunction.svelte
index e05c1de..87ba07a 100644
--- a/src/PlotCovarianceFunction.svelte
+++ b/src/PlotCovarianceFunction.svelte
@@ -44,8 +44,6 @@
   );
 
   // https://observablehq.com/@d3/contours
-  const grid = flatCov;
-
   // Converts from grid coordinates (indexes) to screen coordinates (pixels).
   function createTransform(xScale, yScale) {
     return ({ type, value, coordinates }) => {
@@ -91,6 +89,10 @@
 
 <div id="container">
   <svg bind:this={svg} on:mousemove={handleMousemove}>
+    {#each contourPaths as contourPath, i}
+      <path d={contourPath} style="fill: {color(i)};" />
+    {/each}
+
     <Axes
       {xScale}
       {yScale}
@@ -100,9 +102,6 @@
       height={size}
       {padding}
     />
-    {#each contourPaths as contourPath, i}
-      <path d={contourPath} style="fill: {color(i)};" />
-    {/each}
 
     <XIndicatorCross
       {xScale}

From e1441de6f04d602c96d412b91e13f61b73cf0391 Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:52:18 +0300
Subject: [PATCH 18/24] Blues instead of (reversed) Spectral color scale

---
 src/PlotCovarianceFunction.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PlotCovarianceFunction.svelte b/src/PlotCovarianceFunction.svelte
index 87ba07a..8277c62 100644
--- a/src/PlotCovarianceFunction.svelte
+++ b/src/PlotCovarianceFunction.svelte
@@ -2,7 +2,7 @@
 <script>
   import { onMount } from "svelte";
   import { scaleLinear, scaleSequential } from "d3-scale";
-  import { interpolateSpectral } from "d3-scale-chromatic";
+  import { interpolateBlues as colorScale } from "d3-scale-chromatic";
   import { contours } from "d3-contour";
   import { geoPath, geoIdentity } from "d3-geo";
   import { x1, x2 } from "./store.js";
@@ -64,7 +64,7 @@
   $: mytransform = createTransform(xScale, yScale);
   $: contourPaths = contourGeo.map(mytransform).map(geoPath());
 
-  $: color = scaleSequential([numContours, 0], interpolateSpectral);
+  $: color = scaleSequential([0, contourPaths.length - 1], colorScale);
   onMount(resize);
   $: console.log("width", width, "height", height);
 

From 8e54b3da00e4a6028e454a9802faaae570d5ba01 Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:52:47 +0300
Subject: [PATCH 19/24] reduce number of contours

---
 src/PlotCovarianceFunction.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PlotCovarianceFunction.svelte b/src/PlotCovarianceFunction.svelte
index 8277c62..5f3cc41 100644
--- a/src/PlotCovarianceFunction.svelte
+++ b/src/PlotCovarianceFunction.svelte
@@ -38,7 +38,7 @@
 
   $: contourGenerator = contours().size([covMat.rows, covMat.columns]);
   $: flatCov = covMat.transpose().to1DArray();
-  let numContours = 30;
+  let numContours = 15;
   $: contourGeo = linspace(-1, 1, numContours).map((threshold) =>
     contourGenerator.contour(flatCov, threshold)
   );

From 24af43ddcdfae1726ac98bcb0214c9024e05a233 Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:53:01 +0300
Subject: [PATCH 20/24] TODO comments

---
 src/App.svelte                    | 2 +-
 src/PlotCovarianceFunction.svelte | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/App.svelte b/src/App.svelte
index b70d4a3..6c70dfa 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -357,7 +357,7 @@ Future thoughts:
     /* background-color: #fafafa; */
   }
   .fullcovchart {
-    background-color: #fafafa;
+    background-color: #fafafa; /* TODO */
   }
   .squarechart {
     width: 350px;
diff --git a/src/PlotCovarianceFunction.svelte b/src/PlotCovarianceFunction.svelte
index 5f3cc41..9d6b7ad 100644
--- a/src/PlotCovarianceFunction.svelte
+++ b/src/PlotCovarianceFunction.svelte
@@ -1,5 +1,8 @@
 <!-- Copyright (c) 2021 ST John -->
 <script>
+  // TODO: make contour plot actually react to window resizing
+  // TODO: fix color scale
+
   import { onMount } from "svelte";
   import { scaleLinear, scaleSequential } from "d3-scale";
   import { interpolateBlues as colorScale } from "d3-scale-chromatic";

From 2d4d8e24f5935fd9013b78801cb816dfa0430000 Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:53:13 +0300
Subject: [PATCH 21/24] move Full Covariance plotting checkbox into main area

---
 src/App.svelte        | 19 ++++++++++---------
 src/ConfigPlot.svelte |  4 ----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 6c70dfa..a5e4445 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -63,7 +63,7 @@ Future thoughts:
     confidence: true,
     samples: true,
     marginals: true,
-    fullcov: true,
+    fullcov: false,
   };
 
   let num_grid = 150;
@@ -255,20 +255,21 @@ Future thoughts:
         <PlotBivariateCovariance {atX1} {atX2} {covProps} {plotProps} />
       </div>
     </div>
-  </div>
-
-  {#if plotProps.fullcov}
-    <CollapsibleCard open={true}>
-      <h3 slot="header">&#187; Full covariance</h3>
+    <label
+      ><input type="checkbox" bind:checked={plotProps.fullcov} />Visualize full
+      covariance function <Katex
+        math={"\\operatorname{cov}(f(x),f(x'))"}
+      /></label
+    >
+    {#if plotProps.fullcov}
       <div
-        slot="body"
         class="fullcovchart"
         style="width: {widthPlotMarginals}px; height: {widthPlotMarginals}px;"
       >
         <PlotCovarianceFunction {covMat} />
       </div>
-    </CollapsibleCard>
-  {/if}
+    {/if}
+  </div>
 
   <CollapsibleCard open={true}>
     <h3 slot="header">&#187; Visualization settings</h3>
diff --git a/src/ConfigPlot.svelte b/src/ConfigPlot.svelte
index 52ad05e..0997285 100644
--- a/src/ConfigPlot.svelte
+++ b/src/ConfigPlot.svelte
@@ -24,10 +24,6 @@
   ><input type="checkbox" bind:checked={plotProps.marginals} />Plot marginal
   distributions of <Katex math="f(x_1), \, f(x_2)" /></label
 >
-<label
-  ><input type="checkbox" bind:checked={plotProps.fullcov} />Visualize full
-  covariance function <Katex math={"\\operatorname{cov}(f(x),f(x'))"} /></label
->
 <div class="advanced">
   <label>
     Number of evaluation points: {num_grid}

From eb379515045986a3a29d0ac8c45d38abe41d3ee5 Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Wed, 9 Jun 2021 18:53:42 +0300
Subject: [PATCH 22/24] 0.4.0-dev version

---
 src/version.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/version.js b/src/version.js
index bd56bf0..f334513 100644
--- a/src/version.js
+++ b/src/version.js
@@ -1 +1 @@
-export default "0.3.1";
+export default "0.4.0-dev";

From 9f4a482e522e2b1d41a1f5829f7c5cfe343d2ebd Mon Sep 17 00:00:00 2001
From: ST <st--@users.noreply.github.com>
Date: Fri, 11 Jun 2021 23:18:42 +0300
Subject: [PATCH 23/24] typescript merge-fix

---
 src/App.svelte                    | 2 +-
 src/PlotCovarianceFunction.svelte | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index de064e0..daf305f 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -123,7 +123,7 @@ Future thoughts:
 
   let points = [];
 
-  let widthPlotMarginals;
+  let widthPlotMarginals: number;
 </script>
 
 <div>
diff --git a/src/PlotCovarianceFunction.svelte b/src/PlotCovarianceFunction.svelte
index 9d6b7ad..dcb7a0e 100644
--- a/src/PlotCovarianceFunction.svelte
+++ b/src/PlotCovarianceFunction.svelte
@@ -7,7 +7,8 @@
   import { scaleLinear, scaleSequential } from "d3-scale";
   import { interpolateBlues as colorScale } from "d3-scale-chromatic";
   import { contours } from "d3-contour";
-  import { geoPath, geoIdentity } from "d3-geo";
+  import { geoPath } from "d3-geo";
+  // import { geoIdentity } from "d3-geo";
   import { x1, x2 } from "./store.js";
   import { linspace } from "./mymath.js";
   import { getSVGpoint } from "./getsvgpoint.js";

From 6fc399abae80375f7226f91e909a3c38a800bf49 Mon Sep 17 00:00:00 2001
From: ST John <st--@users.noreply.github.com>
Date: Wed, 12 Apr 2023 09:35:27 +0300
Subject: [PATCH 24/24] npm update

---
 package-lock.json | 103 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 79 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 97d22b6..38b3a38 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,28 +14,32 @@
         "@rollup/plugin-commonjs": "^19.0.0",
         "@rollup/plugin-node-resolve": "^13.0.0",
         "@rollup/plugin-typescript": "^8.0.0",
-        "@tsconfig/svelte": "^1.0.13",
+        "@tsconfig/svelte": "^2.0.1",
         "@types/d3-array": "^2.12.1",
+        "@types/d3-contour": "^2.0.0",
+        "@types/d3-geo": "^2.0.0",
         "@types/d3-random": "^2.2.0",
         "@types/d3-scale": "^3.3.0",
         "@types/d3-scale-chromatic": "^2.0.0",
         "@types/katex": "^0.11.0",
         "d3-array": "latest",
-        "d3-random": "^2.2.2",
+        "d3-contour": "^3.0.1",
+        "d3-geo": "^3.0.1",
+        "d3-random": "^3.0.1",
         "d3-scale": "latest",
         "d3-scale-chromatic": "^3.0.0",
         "katex": "^0.13.11",
         "ml-matrix": "latest",
-        "prettier": "^2.3.0",
+        "prettier": "^2.3.1",
         "prettier-plugin-svelte": "^2.3.0",
-        "rollup": "^2.50.4",
+        "rollup": "^2.51.1",
         "rollup-plugin-css-only": "^3.1.0",
         "rollup-plugin-livereload": "^2.0.0",
         "rollup-plugin-svelte": "^7.0.0",
         "rollup-plugin-terser": "^7.0.0",
         "svelte": "^3.38.2",
-        "svelte-check": "^2.0.0",
-        "svelte-collapsible": "^0.0.9",
+        "svelte-check": "^2.1.0",
+        "svelte-collapsible": "^0.1.1",
         "svelte-preprocess": "^4.7.3",
         "tslib": "^2.0.0",
         "typescript": "^4.3.2"
@@ -262,9 +266,9 @@
       "dev": true
     },
     "node_modules/@tsconfig/svelte": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/@tsconfig/svelte/-/svelte-1.0.13.tgz",
-      "integrity": "sha512-5lYJP45Xllo4yE/RUBccBT32eBlRDbqN8r1/MIvQbKxW3aFqaYPCNgm8D5V20X4ShHcwvYWNlKg3liDh1MlBoA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@tsconfig/svelte/-/svelte-2.0.1.tgz",
+      "integrity": "sha512-aqkICXbM1oX5FfgZd2qSSAGdyo/NRxjWCamxoyi3T8iVQnzGge19HhDYzZ6NrVOW7bhcWNSq9XexWFtMzbB24A==",
       "dev": true
     },
     "node_modules/@types/d3-array": {
@@ -273,6 +277,25 @@
       "integrity": "sha512-hN879HLPTVqZV3FQEXy7ptt083UXwguNbnxdTGzVW4y4KjX5uyNKljrQixZcSJfLyFirbpUokxpXtvR+N5+KIg==",
       "dev": true
     },
+    "node_modules/@types/d3-contour": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-contour/-/d3-contour-2.0.4.tgz",
+      "integrity": "sha512-WMac1xV/mXAgkgr5dUvzsBV5OrgNZDBDpJk9s3v2SadTqGgDRirKABb2Ek2H1pFlYVH4Oly9XJGnuzxKDduqWA==",
+      "dev": true,
+      "dependencies": {
+        "@types/d3-array": "^2",
+        "@types/geojson": "*"
+      }
+    },
+    "node_modules/@types/d3-geo": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-2.0.4.tgz",
+      "integrity": "sha512-kP0LcPVN6P/42hmFt0kZm93YTscfawZo6tioL9y0Ya2l5rxaGoYrIG4zee+yJoK9cLTOc8E8S5ExqTEYVwjIkw==",
+      "dev": true,
+      "dependencies": {
+        "@types/geojson": "*"
+      }
+    },
     "node_modules/@types/d3-random": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/@types/d3-random/-/d3-random-2.2.1.tgz",
@@ -306,6 +329,12 @@
       "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
       "dev": true
     },
+    "node_modules/@types/geojson": {
+      "version": "7946.0.10",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz",
+      "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA==",
+      "dev": true
+    },
     "node_modules/@types/katex": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/@types/katex/-/katex-0.11.1.tgz",
@@ -559,6 +588,18 @@
         "node": ">=12"
       }
     },
+    "node_modules/d3-contour": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-3.1.0.tgz",
+      "integrity": "sha512-vV3xtwrYK5p1J4vyukr70m57mtFTEQYqoaDC1ylBfht/hkdUF0nfWZ1b3V2EPBUVkUkoqq5/fbRoBImBWJgOsg==",
+      "dev": true,
+      "dependencies": {
+        "d3-array": "2 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/d3-format": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
@@ -568,6 +609,18 @@
         "node": ">=12"
       }
     },
+    "node_modules/d3-geo": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.0.tgz",
+      "integrity": "sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==",
+      "dev": true,
+      "dependencies": {
+        "d3-array": "2.5.0 - 3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/d3-interpolate": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
@@ -581,10 +634,13 @@
       }
     },
     "node_modules/d3-random": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-2.2.2.tgz",
-      "integrity": "sha512-0D9P8TRj6qDAtHhRQn6EfdOtHMfsUWanl3yb/84C4DqpZ+VsgfI5iTVRNRbELCfNvRfpMr8OrqqUTQ6ANGCijw==",
-      "dev": true
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz",
+      "integrity": "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
     },
     "node_modules/d3-scale": {
       "version": "4.0.2",
@@ -1536,9 +1592,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.61.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.61.0.tgz",
-      "integrity": "sha512-PDsN7BrVkNZK2+dj/dpKQAWZavbAQ87IXqVvw2+oEYI+GwlTWkvbQtL7F2cCNbMqJEYKPh1EcjSxsnqIb/kyaQ==",
+      "version": "1.62.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.0.tgz",
+      "integrity": "sha512-Q4USplo4pLYgCi+XlipZCWUQz5pkg/ruSSgJ0WRDSb/+3z9tXUOkQ7QPYn4XrhZKYAK4HlpaQecRwKLJX6+DBg==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -1721,19 +1777,18 @@
       }
     },
     "node_modules/svelte-collapse": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/svelte-collapse/-/svelte-collapse-0.0.2.tgz",
-      "integrity": "sha512-9RCiMOiHCOBC1Ah5M7u0STG7HhPBZPwTcGo9iXXQEKWXsLdIVFigVXARr4aG7CwwEXqT2gioVT8hjscGDIh7WQ==",
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/svelte-collapse/-/svelte-collapse-0.0.4.tgz",
+      "integrity": "sha512-TXG836Uhn6SzDFsB3PIHBTormEl45Eb0denD34nYz1zM4PeArh5OYN6G3ZGmMHpG7DAHhRaEX5ikDpHfk2JNcA==",
       "dev": true
     },
     "node_modules/svelte-collapsible": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/svelte-collapsible/-/svelte-collapsible-0.0.9.tgz",
-      "integrity": "sha512-GVLnPSuh2P1JaYpk/KpONakwSrr11577DyjRsHZFqLEq0kTtZWxm2qN5jM4k0VA1DDDrlkrH281NGpmkA9u+YQ==",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/svelte-collapsible/-/svelte-collapsible-0.1.1.tgz",
+      "integrity": "sha512-Kos33wOf3zAaJKPY0ZFlOxXKBhUSQM+XSojKTd7g/TNdQWwKubmSUoIKf0H8X60KTcwVsWtWSzniBPFtUCHruQ==",
       "dev": true,
       "dependencies": {
-        "sirv-cli": "^1.0.0",
-        "svelte-collapse": "0.0.2"
+        "svelte-collapse": "^0.0.4"
       }
     },
     "node_modules/svelte-preprocess": {