Don't throw error when neighbors haven't been loaded yet

cmudig · Jan 6, 2022 · 2bf2787 · 2bf2787
1 parent bafe6ea
commit 2bf2787
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/App.svelte b/src/App.svelte
@@ -625,7 +625,7 @@
         />
       </div>
       <div class="sidebar-content">
-        {#if $visibleSidebarPane == SidebarPanes.CURRENT && !!$thumbnailData}
+        {#if $visibleSidebarPane == SidebarPanes.CURRENT && !!$thumbnailData && !!$neighborData}
           <DefaultThumbnailViewer
             on:thumbnailClick={handleThumbnailClick}
             on:thumbnailHover={handleThumbnailHover}

diff --git a/src/visualization/models/dataset.js b/src/visualization/models/dataset.js
@@ -4,6 +4,7 @@ import { transformPoint } from '../utils/helpers.js';
 import {
   ColumnarData,
   ColumnarFrame,
+  emptyNeighborData,
   FramePreview,
   NeighborPreview,
   Neighbors,
@@ -51,6 +52,7 @@ export class Dataset {
     this.frameCount = frameSource.length;
     this.hasPreviews = !!this.previews;
     this.reformat(frameSource);
+    this.setNeighbors(this.frames.map((f) => emptyNeighborData(f.getIDs())));
   }
 
   reformat(rawData) {

diff --git a/src/visualization/models/frames.js b/src/visualization/models/frames.js
@@ -372,6 +372,14 @@ export class Neighbors extends ColumnarData {
   }
 }
 
+// Returns a data object that can be read by Neighbors to produce a placeholder
+// when neighbors are not yet loaded
+export function emptyNeighborData(ids) {
+  let result = {};
+  ids.forEach((id) => (result[id] = { neighbors: [] }));
+  return result;
+}
+
 // Previews
 
 const PREVIEW_LINE_SCHEMA = {