Merge pull request mapbox#37 from mapbox/d3-dsv

Update from dsv to d3-dsv

Author: tmcw

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 5.0.0
+
+* Updates `dsv` dependency to `d3-dsv`
+
 ## 4.0.0
 
 * [toLine and toPolygon now include all properties of all aggregated objects.](https://github.com/mapbox/csv2geojson/pull/29)

index.js

@@ -1,4 +1,4 @@
-var dsv = require('dsv'),
+var dsv = require('d3-dsv'),
     sexagesimal = require('sexagesimal');
 
 function isLat(f) { return !!f.match(/(Lat)(itude)?/gi); }
@@ -13,7 +13,7 @@ function autoDelimiter(x) {
     var results = [];
 
     delimiters.forEach(function(delimiter) {
-        var res = dsv(delimiter).parse(x);
+        var res = dsv.dsv(delimiter).parse(x);
         if (res.length >= 1) {
             var count = keyCount(res[0]);
             for (var i = 0; i < res.length; i++) {
@@ -35,10 +35,21 @@ function autoDelimiter(x) {
     }
 }
 
+/**
+ * Silly stopgap for dsv to d3-dsv upgrade
+ *
+ * @param {Array} x dsv output
+ * @returns {Array} array without columns member
+ */
+function deleteColumns(x) {
+    delete x.columns;
+    return x;
+}
+
 function auto(x) {
     var delimiter = autoDelimiter(x);
     if (!delimiter) return null;
-    return dsv(delimiter).parse(x);
+    return deleteColumns(dsv.dsv(delimiter).parse(x));
 }
 
 function csv2geojson(x, options, callback) {
@@ -69,7 +80,8 @@ function csv2geojson(x, options, callback) {
         });
     }
 
-    var parsed = (typeof x == 'string') ? dsv(options.delimiter).parse(x) : x;
+    var parsed = (typeof x == 'string') ? 
+        dsv.dsv(options.delimiter).parse(x) : x;
 
     if (!parsed.length) return callback(null, featurecollection);
 
@@ -84,7 +96,7 @@ function csv2geojson(x, options, callback) {
             return callback({
                 type: 'Error',
                 message: 'Latitude and longitude fields not present',
-                data: parsed,
+                data: deleteColumns(parsed),
                 fields: fields
             });
         }
@@ -196,8 +208,8 @@ function toPolygon(gj) {
 module.exports = {
     isLon: isLon,
     isLat: isLat,
-    csv: dsv.csv.parse,
-    tsv: dsv.tsv.parse,
+    csv: dsv.csvParse,
+    tsv: dsv.tsvParse,
     dsv: dsv,
     auto: auto,
     csv2geojson: csv2geojson,

package.json

@@ -16,15 +16,14 @@
   },
   "license": "BSD",
   "devDependencies": {
-    "brfs": "^1.3.0",
     "browserify": "^8.1.3",
     "expect.js": "~0.2.0",
     "mocha": "~1.8",
     "mocha-phantomjs": "~1.1.1"
   },
   "dependencies": {
     "optimist": "~0.6.1",
-    "dsv": "0.0.3",
+    "d3-dsv": "0.2.0",
     "sexagesimal": "0.4.0",
     "concat-stream": "~1.0.1"
   }

test/csv2geojson.js

@@ -28,16 +28,6 @@ describe('csv2geojson', function() {
         });
     });
 
-    describe('#csv', function() {
-        it('handles empty input', function() {
-            expect(csv2geojson.csv('')).to.eql([]);
-        });
-
-        it('handles simple fields', function() {
-            expect(csv2geojson.csv('a,b\n1,2')).to.eql([{a: '1', b: '2'}]);
-        });
-    });
-
     describe('#sexagesimal', function() {
         it('degrees', function(done) {
             csv2geojson.csv2geojson(textFile('degrees.csv'), function(err, data) {
@@ -217,13 +207,13 @@ describe('csv2geojson', function() {
         });
 
         it('accepts a parsed object', function() {
-            csv2geojson.csv2geojson(csv2geojson.csv(textFile('simple.csv')), function(err, data) {
+            csv2geojson.csv2geojson(textFile('simple.csv'), function(err, data) {
                 expect(data).to.eql(jsonFile('simple.geojson'));
             });
         });
 
         it('reports bad coordinates', function() {
-            csv2geojson.csv2geojson(csv2geojson.csv(textFile('bad_coord.csv')), function(err, data) {
+            csv2geojson.csv2geojson(textFile('bad_coord.csv'), function(err, data) {
                 expect(data).to.eql({
                     type: 'FeatureCollection',
                     features: []
@@ -233,7 +223,7 @@ describe('csv2geojson', function() {
         });
 
         it('returns an error on not finding fields', function() {
-            csv2geojson.csv2geojson(csv2geojson.csv('name\nfoo'), function(err, data) {
+            csv2geojson.csv2geojson('name\nfoo', function(err, data) {
                 expect(err).to.eql({
                     type: 'Error',
                     message: 'Latitude and longitude fields not present',