Permalink
Browse files

Remove unnecessary reliance on projection.

Eventually we want to modify a projection so that input ellipsoidal
coordinates are transformed to the auxiliary sphere even when the
projection is used directly in a non-streaming fashion.  However, this
should probably be done inside d3.geo.projectionMutator if this ends up
in core.
  • Loading branch information...
1 parent 48abb0b commit b0f12b3992dd10c35c49e04be2e9d78b6a453c78 @jasondavies jasondavies committed Mar 4, 2013
Showing with 9 additions and 14 deletions.
  1. +9 −14 geo/projection/auxiliary.js
@@ -5,21 +5,16 @@ d3.geo.auxiliary = function() {
aux = auxiliaryLatitude[type],
auxφ = aux(e);
- function auxiliary(projection) {
+ function auxiliary(stream) {
return {
- stream: function(stream) {
- stream = projection.stream(stream);
- return {
- point: function(x, y) {
- stream.point(x, auxφ(y * radians) * degrees);
- },
- sphere: function() { stream.sphere(); },
- lineStart: function() { stream.lineStart(); },
- lineEnd: function() { stream.lineEnd(); },
- polygonStart: function() { stream.polygonStart(); },
- polygonEnd: function() { stream.polygonEnd(); }
- };
- }
+ point: function(x, y) {
+ stream.point(x, auxφ(y * radians) * degrees);
+ },
+ sphere: function() { stream.sphere(); },
+ lineStart: function() { stream.lineStart(); },
+ lineEnd: function() { stream.lineEnd(); },
+ polygonStart: function() { stream.polygonStart(); },
+ polygonEnd: function() { stream.polygonEnd(); }
};
}

0 comments on commit b0f12b3

Please sign in to comment.