Simplify data fetching #9

1c017e15 · Lillian Gray · 96c7b7ca · 1c017e15 · 1c017e15
Commit 1c017e15 authored 5 years ago by Lillian Gray
--- a/index.html
+++ b/index.html
@@ -20,7 +20,7 @@
    <script src="js/loader.js"></script>
    <script>
 		google.charts.load('45.2', {packages:['corechart', 'controls']});
-		google.charts.setOnLoadCallback(onAPILoad);
+		google.charts.setOnLoadCallback(getData);
    </script>
 </head>
 <body>

--- a/js/main.js
+++ b/js/main.js
@@ -28,19 +28,15 @@ var startDate
 var URLComponents = document.URL.split('?')
 /*called when GoogleAPI finishes loading in index.html
-  calls getData and then passes the data into initializeLineChart when finished*/
+  fetches column data from config.json
-function onAPILoad(){
+  fetches data for chart from text file generated by data_gen.py
-	getData().done(initializeLineChart)
+  passes the data into initializeLineChart when finished*/
-}
-//fetches data for chart from text file generated by data_gen.py
 function getData(){
 	$.getJSON("config.json", function(data){
 		buildings = data.building
 	})
-	return $.ajax({
+	$.getJSON("raw_line_chart.txt", function(data){
-		url: "raw_line_chart.txt", //location of data file
+		initializeLineChart(data)
-		dataType: "json",
 	})
 }