Skip to content

Commit

Permalink
Update dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
mbostock committed Feb 10, 2016
1 parent 37f91ba commit e19633e
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 deletions bin/topojson
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env node

var path = require("path"),
rw = require("rw"),
rw = require("rw").dash,
d3 = require("d3"),
optimist = require("optimist"),
shapefile = require("shapefile"),
queue = require("d3-queue"),
queue = require("d3-queue").queue,
topojson = require("../");

require("d3-geo-projection")(d3);
Expand All @@ -25,7 +25,7 @@ var argv = optimist
.options("o", {
alias: "out",
describe: "output TopoJSON file name",
default: "/dev/stdout"
default: "-"
})
.options("q", {
alias: "quantization",
Expand Down Expand Up @@ -152,7 +152,7 @@ var argv = optimist
.check(function(argv) {
if (argv.help) return;
if (argv.version) return console.log(topojson.version), process.exit(0);
if (!argv._.length) argv._ = ["/dev/stdin"];
if (!argv._.length) argv._ = ["-"];
if (+argv.s && +argv["simplify-proportion"]) throw new Error("--simplify and --simplify-proportion are exclusive");
if (+argv["simplify-proportion"] < 0 || +argv["simplify-proportion"] >= 1) throw new Error("--simplify-proportion must be between 0 and 1");
if (argv["allow-empty"]) argv.filter = "none";
Expand Down
4 changes: 2 additions & 2 deletions bin/topojson-geojson
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env node

var path = require("path"),
rw = require("rw"),
rw = require("rw").dash,
optimist = require("optimist"),
type = require("../lib/topojson/type"),
topojson = require("../");
Expand Down Expand Up @@ -32,7 +32,7 @@ var argv = optimist
.check(function(argv) {
if (argv.help) return;
if (argv._.length > 1) throw new Error("at most one input file allowed");
if (!argv._.length) argv._ = ["/dev/stdin"];
if (!argv._.length) argv._ = ["-"];
})
.argv;

Expand Down
6 changes: 3 additions & 3 deletions bin/topojson-group
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var fs = require("fs");

var d3 = require("d3"),
optimist = require("optimist"),
rw = require("rw"),
rw = require("rw").dash,
topojson = require("../"),
mergeProperties = require("../lib/topojson/merge-properties");

Expand All @@ -18,7 +18,7 @@ var argv = optimist
.options("o", {
alias: "out",
describe: "output TopoJSON file name",
default: "/dev/stdout",
default: "-",
})
.options("p", {
alias: "properties",
Expand All @@ -33,7 +33,7 @@ var argv = optimist
.check(function(argv) {
if (argv.help) return;
if (argv._.length > 1) throw new Error("at most one input file allowed");
if (!argv._.length) argv._ = ["/dev/stdin"];
if (!argv._.length) argv._ = ["-"];
})
.argv;

Expand Down
6 changes: 3 additions & 3 deletions bin/topojson-merge
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var fs = require("fs");

var d3 = require("d3"),
optimist = require("optimist"),
rw = require("rw"),
rw = require("rw").dash,
topojson = require("../"),
mergeProperties = require("../lib/topojson/merge-properties");

Expand All @@ -18,7 +18,7 @@ var argv = optimist
.options("o", {
alias: "out",
describe: "output TopoJSON file name",
default: "/dev/stdout"
default: "-"
})
.options("io", {
alias: "in-object",
Expand Down Expand Up @@ -48,7 +48,7 @@ var argv = optimist
.check(function(argv) {
if (argv.help) return;
if (argv._.length > 1) throw new Error("at most one input file allowed");
if (!argv._.length) argv._ = ["/dev/stdin"];
if (!argv._.length) argv._ = ["-"];
if (!argv.io) throw new Error("input object name required");
if (!argv.oo) throw new Error("output object name required");
if (argv.k) argv.k = new Function("d", "return " + argv.k);
Expand Down
8 changes: 4 additions & 4 deletions bin/topojson-svg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

var fs = require("fs"),
os = require("os"),
rw = require("rw"),
rw = require("rw").dash,
d3 = require("d3"),
optimist = require("optimist"),
topojson = require("../");
Expand All @@ -19,7 +19,7 @@ var argv = optimist
.options("o", {
alias: "out",
describe: "output SVG file name",
default: "/dev/stdout"
default: "-"
})
.options("width", {
describe: "width of the output SVG",
Expand All @@ -41,7 +41,7 @@ var argv = optimist
.check(function(argv) {
if (argv.help) return;
if (argv._.length > 1) throw new Error("at most one input file allowed");
if (!argv._.length) argv._ = ["/dev/stdin"];
if (!argv._.length) argv._ = ["-"];
})
.argv;

Expand All @@ -60,7 +60,7 @@ var path = d3.geo.path().projection(isNaN(precision) ? null : d3.geo.transform({
}
}));

var out = argv.o === "/dev/stdout"
var out = (argv.o === "-" || argv.o === "/dev/stdout")
? process.stdout
: fs.createWriteStream(argv.o, "utf8");

Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "topojson",
"version": "1.6.22",
"version": "1.6.23",
"description": "An extension to GeoJSON that encodes topology.",
"keywords": [
"topojson",
Expand Down Expand Up @@ -36,9 +36,9 @@
"dependencies": {
"d3": "3",
"d3-geo-projection": "0.2",
"d3-queue": "1",
"d3-queue": "2",
"optimist": "0.3",
"rw": "0.1",
"rw": "1",
"shapefile": "0.3"
},
"devDependencies": {
Expand Down

0 comments on commit e19633e

Please sign in to comment.