Merge pull request #31 from mikesall/ms-file-support

support tsv files #8
charted-co · Dec 1, 2014 · 3971d07 · 3971d07
2 parents 988d4a5 + 7aa4b7a
commit 3971d07
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/pub/scripts/PageData.js b/pub/scripts/PageData.js
@@ -15,7 +15,14 @@ PageData.prototype.fetchData = function () {
       return this.callback(error, null)
     }
 
-    var fileRows = d3.csv.parseRows(fileString)
+    var fileExtention = Utils.getFileExtension(this.dataUrl)
+    var fileRows = []
+    if (fileExtention === 'tsv') {
+      fileRows = d3.tsv.parseRows(fileString)
+    } else {
+      fileRows = d3.csv.parseRows(fileString)
+    }
+
     var fileFieldNames = fileRows.shift()
     // create array of row objects with the field names as keys
     var fileData = fileRows.map(function (fileRow) {

diff --git a/pub/scripts/Utils.js b/pub/scripts/Utils.js
@@ -127,3 +127,10 @@ Utils.getTrimmedExtent = function (array) {
 
   return [firstNonEmptyItem, lastNonEmptyItem]
 }
+
+Utils.getFileExtension = function (fileString) {
+  // remove any url parameters
+  var fileStringWithoutParams = fileString.substring(0, fileString.indexOf('?'))
+  var fileExtention = fileStringWithoutParams.split('.').pop()
+  return fileExtention.toLowerCase()
+}