Revert cache of projection stream.

chjkw · May 20, 2013 · cf4c17a · cf4c17a
1 parent ab3149e
commit cf4c17a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/d3.js b/d3.js
@@ -3633,12 +3633,9 @@ d3 = function() {
     return stream;
   }
   d3.geo.path = function() {
-    var pointRadius = 4.5, projection, context, projectStream, contextStream, objectStream;
+    var pointRadius = 4.5, projection, context, projectStream, contextStream;
     function path(object) {
-      if (object) {
-        if (typeof pointRadius === "function") contextStream.pointRadius(+pointRadius.apply(this, arguments));
-        d3.geo.stream(object, objectStream);
-      }
+      if (object) d3.geo.stream(object, projectStream(contextStream.pointRadius(typeof pointRadius === "function" ? +pointRadius.apply(this, arguments) : pointRadius)));
       return contextStream.result();
     }
     path.area = function(object) {
@@ -3659,19 +3656,16 @@ d3 = function() {
     path.projection = function(_) {
       if (!arguments.length) return projection;
       projectStream = (projection = _) ? _.stream || d3_geo_pathProjectStream(_) : d3_identity;
-      objectStream = projectStream(contextStream);
       return path;
     };
     path.context = function(_) {
       if (!arguments.length) return context;
       contextStream = (context = _) == null ? new d3_geo_pathBuffer() : new d3_geo_pathContext(_);
-      objectStream = projectStream(contextStream);
       return path;
     };
     path.pointRadius = function(_) {
       if (!arguments.length) return pointRadius;
-      pointRadius = typeof _ === "function" ? _ : (_ = +_, contextStream.pointRadius(_), 
-      _);
+      pointRadius = typeof _ === "function" ? _ : +_;
       return path;
     };
     return path.projection(d3.geo.albersUsa()).context(null);