simplify: don't recreate JSON

Author: artoonie

common/viewUtils.py

@@ -10,7 +10,6 @@
 from visualizer.descriptors.textForWinnerUtils import as_caption
 from visualizer.graph.graphCreator import make_graph_with_file
 from visualizer.models import TextForWinner
-from visualizer.pie.graphToRCtab import graph_to_rctab_json
 from visualizer.sankey.graphToD3 import D3Sankey
 from visualizer.sidecar.reader import SidecarReader
 from visualizer.tabular.tabular import TabulateByRoundInteractive, \
@@ -69,8 +68,7 @@ def get_data_for_graph(graph, config):
         'tabularByRound': tabularByRound,
         'tabularByRoundInteractive': tabularByRoundInteractive,
         'graph': graph,
-        'rawData': graph._raw_JSON,
-        'pieData': graph_to_rctab_json(graph),
+        'pieData': graph.get_migrated_raw_data(),
         'textForWinner': as_caption(config).lower(),
     }
     roundDescriberData = get_data_for_round_describer(graph, config)

rcvis/settings.py

@@ -193,14 +193,6 @@
 }
 
 
-def pie_chart_no_cache(headers, path, url):
-    """In development, ensure browsers revalidate the pie chart component on every load."""
-    if DEBUG and url.endswith('pie-chart.es.js'):
-        headers['Cache-Control'] = 'no-cache'
-
-
-WHITENOISE_ADD_HEADERS_FUNCTION = pie_chart_no_cache
-
 NODE_PACKAGE_JSON = './package.json'
 NODE_MODULES_ROOT = './node_modules'
 NODE_PACKAGE_MANAGER_EXECUTABLE = os.environ.get('NODE_PACKAGE_MANAGER_EXECUTABLE', '/usr/bin/npm')

static/visualizer/round-player.js

@@ -4,12 +4,14 @@ function RoundPlayer({
   onPlay,
   totalRounds,
   timeBetweenStepsMs,
+  firstStepHoldTimeMs,
 }) {
   let isPlaying = false;
   let currentStep = totalRounds - 1;
   // Imported from visualize-common.js
   let stepTimeMs =
     timeBetweenStepsMs || getTimeBetweenAnimationStepsMs(totalRounds);
+  let firstStepTimeMs = firstStepHoldTimeMs || stepTimeMs;
   let timer = null;
   const svgNS = "http://www.w3.org/2000/svg";
   const MIN_ROUNDS_FOR_NAV = 3;
@@ -132,21 +134,21 @@ function RoundPlayer({
     changeStep(step);
   }
 
-  function nextStep() {
+  function nextStep(currStepTimeMs) {
     if (!isPlaying) return;
 
     timer = window.setTimeout(() => {
       changeStep(currentStep + 1);
-      nextStep();
-    }, stepTimeMs);
+      nextStep(stepTimeMs);
+    }, currStepTimeMs);
   }
 
   function play() {
     if (onPlay) onPlay();
     isPlaying = true;
     container.querySelector(".round-player-play-btn").innerText = "Stop";
     changeStep(0);
-    nextStep();
+    nextStep(firstStepTimeMs);
   }
 
   function stop() {

templates/pie/pie-nonblocking.html

@@ -43,6 +43,7 @@
       totalRounds: {{ config.numRounds }},
       onChange: updatePieChartRound,
       timeBetweenStepsMs: 3000,
+      firstStepHoldTimeMs: 500,
     });
 
     function updatePieChartRound(sliderIndex) {

visualizer/common.py

@@ -34,14 +34,6 @@ def percentify(numerator, denominator):
     return str(round(10000.0 * floatVal) / 100.0) + "%"
 
 
-def stringify(value):
-    """ Convert a number to string, matching RCTab JSON convention.
-        Integers are formatted without decimals. """
-    if isinstance(value, float) and value == int(value):
-        return str(int(value))
-    return str(value)
-
-
 def candidate_renames():
     """ A dictionary mapping how we should rename candidate names """
     return {

visualizer/graph/graph.py

@@ -97,6 +97,14 @@ def set_elimination_order(self, orderedCandidates):
         # Reset summary: it's no longer accurate
         self.summary = None
 
+    def set_migrated_raw_data(self, migratedRawData):
+        """ As of implementation, only used for pie chart visualization. """
+        self.migratedRawData = migratedRawData
+
+    def get_migrated_raw_data(self):
+        """ As of implementation, only used for pie chart visualization. """
+        return self.migratedRawData
+
     def set_date(self, date):
         """ Sets the date of this election """
         assert isinstance(date, datetime.datetime)

visualizer/graph/readRCVRCJSON.py

@@ -271,12 +271,12 @@ class JSONReader:
     eliminationOrder: list
 
     def __init__(self, data):
-        self.parse_data(data)
+        data = self.parse_and_migrate_data(data)
         self.graph.create_graph_from_rounds(self.rounds)
+        self.graph.set_migrated_raw_data(data)
         self.set_elimination_order(self.rounds, self.graph.candidates)
-        self.graph._raw_JSON = data
 
-    def parse_data(self, data):
+    def parse_and_migrate_data(self, data):
         """ Parses the JSON data, or raises an exception on failure """
         def get_migration_tasks():
             return [FixNoTransfersTask,
@@ -362,6 +362,7 @@ def load_rounds(data):
 
         self.graph = graph
         self.rounds = rounds
+        return data
 
     def get_graph(self):
         """ Returns the Graph object """
@@ -370,7 +371,7 @@ def get_graph(self):
     def get_rounds(self):
         """ Returns the list of rounds """
         return self.rounds
-
+    
     def set_elimination_order(self, rounds, candidates):
         """ Sets the elimination order given each round and a list of Candidates """
         eliminationOrder = []