Skip to content

Commit b3c69e1

Browse files
mbostockmbostock
committed
Consolidate duplicate code.
1 parent 4605708 commit b3c69e1

6 files changed

Lines changed: 37 additions & 47 deletions

File tree

‎d3.js‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,16 @@
1414
d3 = {
1515
version: "3.0.0pre"
1616
};
17-
var π = Math.PI, ε = 1e-6, εε = .001, d3_radians = π / 180, d3_degrees = 180 / π, d3_zero = function() {
17+
var π = Math.PI, ε = 1e-6, εε = .001, d3_radians = π / 180, d3_degrees = 180 / π;
18+
function d3_zero() {
1819
return 0;
19-
};
20+
}
21+
function d3_target(d) {
22+
return d.target;
23+
}
24+
function d3_source(d) {
25+
return d.source;
26+
}
2027
function d3_class(ctor, properties) {
2128
try {
2229
for (var key in properties) {
@@ -3151,7 +3158,7 @@
31513158
return area;
31523159
};
31533160
d3.svg.chord = function() {
3154-
var source = d3_svg_chordSource, target = d3_svg_chordTarget, radius = d3_svg_chordRadius, startAngle = d3_svg_arcStartAngle, endAngle = d3_svg_arcEndAngle;
3161+
var source = d3_source, target = d3_target, radius = d3_svg_chordRadius, startAngle = d3_svg_arcStartAngle, endAngle = d3_svg_arcEndAngle;
31553162
function chord(d, i) {
31563163
var s = subgroup(this, source, d, i), t = subgroup(this, target, d, i);
31573164
return "M" + s.p0 + arc(s.r, s.p1, s.a1 - s.a0) + (equals(s, t) ? curve(s.r, s.p1, s.r, s.p0) : curve(s.r, s.p1, t.r, t.p0) + arc(t.r, t.p1, t.a1 - t.a0) + curve(t.r, t.p1, s.r, s.p0)) + "Z";
@@ -3202,17 +3209,11 @@
32023209
};
32033210
return chord;
32043211
};
3205-
function d3_svg_chordSource(d) {
3206-
return d.source;
3207-
}
3208-
function d3_svg_chordTarget(d) {
3209-
return d.target;
3210-
}
32113212
function d3_svg_chordRadius(d) {
32123213
return d.radius;
32133214
}
32143215
d3.svg.diagonal = function() {
3215-
var source = d3_svg_chordSource, target = d3_svg_chordTarget, projection = d3_svg_diagonalProjection;
3216+
var source = d3_source, target = d3_target, projection = d3_svg_diagonalProjection;
32163217
function diagonal(d, i) {
32173218
var p0 = source.call(this, d, i), p3 = target.call(this, d, i), m = (p0.y + p3.y) / 2, p = [ p0, {
32183219
x: p0.x,
@@ -5918,7 +5919,7 @@
59185919
};
59195920
}
59205921
d3.geo.greatArc = function() {
5921-
var source = d3_geo_greatArcSource, p0, target = d3_geo_greatArcTarget, p1, precision = 6 * d3_radians, interpolate = d3_geo_greatArcInterpolator();
5922+
var source = d3_source, p0, target = d3_target, p1, precision = 6 * d3_radians, interpolate = d3_geo_greatArcInterpolator();
59225923
function greatArc() {
59235924
var d = greatArc.distance.apply(this, arguments), t = 0, dt = precision / d, coordinates = [ p0 ];
59245925
while ((t += dt) < 1) coordinates.push(interpolate(t));
@@ -5952,12 +5953,6 @@
59525953
};
59535954
return greatArc;
59545955
};
5955-
function d3_geo_greatArcSource(d) {
5956-
return d.source;
5957-
}
5958-
function d3_geo_greatArcTarget(d) {
5959-
return d.target;
5960-
}
59615956
function d3_geo_greatArcInterpolator() {
59625957
var x0, y0, cy0, sy0, kx0, ky0, x1, y1, cy1, sy1, kx1, ky1, d, k;
59635958
function interpolate(t) {

‎d3.min.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/core/core.js‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,16 @@ var π = Math.PI,
44
ε = 1e-6,
55
εε = 1e-3,
66
d3_radians = π / 180,
7-
d3_degrees = 180 / π,
8-
d3_zero = function() { return 0; };
7+
d3_degrees = 180 / π;
8+
9+
function d3_zero() {
10+
return 0;
11+
}
12+
13+
function d3_target(d) {
14+
return d.target;
15+
}
16+
17+
function d3_source(d) {
18+
return d.source;
19+
}

‎src/geo/greatArc.js‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
d3.geo.greatArc = function() {
2-
var source = d3_geo_greatArcSource, p0,
3-
target = d3_geo_greatArcTarget, p1,
2+
var source = d3_source, p0,
3+
target = d3_target, p1,
44
precision = 6 * d3_radians,
55
interpolate = d3_geo_greatArcInterpolator();
66

@@ -14,7 +14,7 @@ d3.geo.greatArc = function() {
1414
return {type: "LineString", coordinates: coordinates};
1515
}
1616

17-
// Length returned in d3_radians; multiply by radius for distance.
17+
// Length returned in radians; multiply by radius for distance.
1818
greatArc.distance = function() {
1919
if (typeof source === "function") interpolate.source(p0 = source.apply(this, arguments));
2020
if (typeof target === "function") interpolate.target(p1 = target.apply(this, arguments));
@@ -35,7 +35,7 @@ d3.geo.greatArc = function() {
3535
return greatArc;
3636
};
3737

38-
// Precision is specified in d3_degrees.
38+
// Precision is specified in degrees.
3939
greatArc.precision = function(_) {
4040
if (!arguments.length) return precision / d3_radians;
4141
precision = _ * d3_radians;
@@ -45,14 +45,6 @@ d3.geo.greatArc = function() {
4545
return greatArc;
4646
};
4747

48-
function d3_geo_greatArcSource(d) {
49-
return d.source;
50-
}
51-
52-
function d3_geo_greatArcTarget(d) {
53-
return d.target;
54-
}
55-
5648
function d3_geo_greatArcInterpolator() {
5749
var x0, y0, cy0, sy0, kx0, ky0,
5850
x1, y1, cy1, sy1, kx1, ky1,

‎src/svg/chord.js‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
d3.svg.chord = function() {
2-
var source = d3_svg_chordSource,
3-
target = d3_svg_chordTarget,
2+
var source = d3_source,
3+
target = d3_target,
44
radius = d3_svg_chordRadius,
55
startAngle = d3_svg_arcStartAngle,
66
endAngle = d3_svg_arcEndAngle;
@@ -78,14 +78,6 @@ d3.svg.chord = function() {
7878
return chord;
7979
};
8080

81-
function d3_svg_chordSource(d) {
82-
return d.source;
83-
}
84-
85-
function d3_svg_chordTarget(d) {
86-
return d.target;
87-
}
88-
8981
function d3_svg_chordRadius(d) {
9082
return d.radius;
9183
}

‎src/svg/diagonal.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
d3.svg.diagonal = function() {
2-
var source = d3_svg_chordSource,
3-
target = d3_svg_chordTarget,
2+
var source = d3_source,
3+
target = d3_target,
44
projection = d3_svg_diagonalProjection;
55

66
function diagonal(d, i) {

0 commit comments

Comments
 (0)