Merge pull request #1153 from nextstrain/transmission-perf

Improve performance when transmission lines are not drawn
nextstrain · Jun 3, 2020 · 55208f6 · 55208f6
2 parents 748ec8a + a9ef44b
commit 55208f6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/src/components/map/map.js b/src/components/map/map.js
@@ -220,6 +220,7 @@ class Map extends React.Component {
         this.props.pieChart,
         this.props.legendValues,
         this.props.colorBy,
+        this.props.showTransmissionLines,
         this.props.dispatch
       );
 
@@ -385,6 +386,7 @@ class Map extends React.Component {
         nextProps.pieChart,
         nextProps.legendValues,
         nextProps.colorBy,
+        nextProps.showTransmissionLines,
         nextProps.dispatch
       );
       const d3elems = drawDemesAndTransmissions(
@@ -397,8 +399,7 @@ class Map extends React.Component {
         nextProps.dateMaxNumeric,
         nextProps.pieChart,
         nextProps.geoResolution,
-        nextProps.dispatch,
-        nextProps.showTransmissionLines
+        nextProps.dispatch
       );
       this.setState({
         d3elems,

diff --git a/src/components/map/mapHelpers.js b/src/components/map/mapHelpers.js
@@ -137,8 +137,7 @@ export const drawDemesAndTransmissions = (
   numDateMax,
   pieChart, /* bool */
   geoResolution,
-  dispatch,
-  showTransmissionLines
+  dispatch
 ) => {
 
   // add transmission lines
@@ -165,7 +164,7 @@ export const drawDemesAndTransmissions = (
     .attr("stroke-opacity", 0.6)
     .attr("stroke-linecap", "round")
     .attr("stroke", (d) => { return d.color; })
-    .attr("stroke-width", showTransmissionLines ? 1 : 0);
+    .attr("stroke-width", 1);
 
   const visibleTips = nodes[0].tipCount;
   const demeMultiplier =

diff --git a/src/components/map/mapHelpersLatLong.js b/src/components/map/mapHelpersLatLong.js
@@ -399,6 +399,7 @@ export const createDemeAndTransmissionData = (
   pieChart,
   legendValues,
   colorBy,
+  showTransmissionLines,
   dispatch
 ) => {
   /*
@@ -414,16 +415,21 @@ export const createDemeAndTransmissionData = (
     demeIndices
   } = setupDemeData(nodes, visibility, geoResolution, nodeColors, triplicate, metadata, map, pieChart, legendValues, colorBy);
 
-  /* second time so that we can get Bezier */
-  const { transmissionData, transmissionIndices, demesMissingLatLongs } = setupTransmissionData(
-    nodes,
-    visibility,
-    geoResolution,
-    nodeColors,
-    triplicate,
-    metadata,
-    map
-  );
+  let transmissionData = [];
+  let transmissionIndices = {};
+  let demesMissingLatLongs = new Set(); // TODO: this won't be filled in if we're not showing transmission lines...
+  if (showTransmissionLines) {
+    /* second time so that we can get Bezier */
+    ({ transmissionData, transmissionIndices, demesMissingLatLongs } = setupTransmissionData(
+      nodes,
+      visibility,
+      geoResolution,
+      nodeColors,
+      triplicate,
+      metadata,
+      map
+    ));
+  }
 
   const filteredDemesMissingLatLongs = [...demesMissingLatLongs].filter((value) => {
     return value.toLowerCase() !== "unknown";