Commit 88862d37 authored by Mike Bostock's avatar Mike Bostock
Browse files

Consolidate.

parent db39176f
......@@ -3749,9 +3749,7 @@ d3 = function() {
function d3_geo_identityRotation(λ, φ) {
return [ λ > π ? λ - 2 * π : λ < -π ? λ + 2 * π : λ, φ ];
}
d3_geo_identityRotation.invert = function(x, y) {
return [ x, y ];
};
d3_geo_identityRotation.invert = d3_geo_equirectangular;
function d3_geo_rotation(δλ, δφ, δγ) {
return δλ ? δφ || δγ ? d3_geo_compose(d3_geo_rotationλ(δλ), d3_geo_rotationφγ(δφ, δγ)) : d3_geo_rotationλ(δλ) : δφ || δγ ? d3_geo_rotationφγ(δφ, δγ) : d3_geo_identityRotation;
}
......
This diff is collapsed.
......@@ -22,7 +22,7 @@ function d3_geo_identityRotation(λ, φ) {
return [λ > π ? λ - 2 * π : λ < -π ? λ + 2 * π : λ, φ];
}
d3_geo_identityRotation.invert = function(x, y) { return [x, y]; };
d3_geo_identityRotation.invert = d3_geo_equirectangular;
// Note: |δλ| must be < 2π
function d3_geo_rotation(δλ, δφ, δγ) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment