diff --git a/index.html b/index.html
index 71309ce788986b34229b702706ec2b69f83c21f5..7ca19d6e7ad9583b477640ebe0bb28140722d9bd 100755
--- 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>
diff --git a/js/main.js b/js/main.js
index 9fabf79b68d1fcb01f933c4385ec7849c7866871..753987caf7be6ef507c08a0b984309f1f4de0d42 100755
--- 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*/
-function onAPILoad(){
- getData().done(initializeLineChart)
-}
-
-//fetches data for chart from text file generated by data_gen.py
+ fetches column data from config.json
+ fetches data for chart from text file generated by data_gen.py
+ passes the data into initializeLineChart when finished*/
function getData(){
$.getJSON("config.json", function(data){
buildings = data.building
})
- return $.ajax({
- url: "raw_line_chart.txt", //location of data file
- dataType: "json",
+ $.getJSON("raw_line_chart.txt", function(data){
+ initializeLineChart(data)
})
}