Merge branch 'clip-extent'

d3 · Mar 21, 2013 · b9e35eb · b9e35eb
2 parents 51228cc + 3de9ef3
commit b9e35eb
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 20 deletions.
diff --git a/component.json b/component.json
@@ -1,5 +1,5 @@
 {
   "name": "d3",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "main": "./d3.js"
 }
diff --git a/d3.js b/d3.js
@@ -1,6 +1,6 @@
 d3 = function() {
   var d3 = {
-    version: "3.1.0"
+    version: "3.1.1"
   };
   if (!Date.now) Date.now = function() {
     return +new Date();
@@ -2642,7 +2642,7 @@ d3 = function() {
       return code;
     }
   }
-  var d3_geo_clipViewMAX = 1e15;
+  var d3_geo_clipViewMAX = 1e9;
   function d3_geo_clipView(x0, y0, x1, y1) {
     return function(listener) {
       var listener_ = listener, bufferListener = d3_geo_clipBufferListener(), segments, polygon, ring;
@@ -2725,6 +2725,8 @@ d3 = function() {
         if (v_) listener.lineEnd();
       }
       function linePoint(x, y) {
+        x = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, x));
+        y = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, y));
         var v = visible(x, y);
         if (polygon) ring.push([ x, y ]);
         if (first) {
@@ -2765,10 +2767,6 @@ d3 = function() {
       return ca !== cb ? ca - cb : ca === 0 ? b[1] - a[1] : ca === 1 ? a[0] - b[0] : ca === 2 ? a[1] - b[1] : b[0] - a[0];
     }
     function clipLine(a, b) {
-      a[0] = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, a[0]));
-      a[1] = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, a[1]));
-      b[0] = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, b[0]));
-      b[1] = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, b[1]));
       var dx = b[0] - a[0], dy = b[1] - a[1], t = [ 0, 1 ];
       if (Math.abs(dx) < ε && Math.abs(dy) < ε) return x0 <= a[0] && a[0] <= x1 && y0 <= a[1] && a[1] <= y1;
       if (d3_geo_clipViewT(x0 - a[0], dx, t) && d3_geo_clipViewT(a[0] - x1, -dx, t) && d3_geo_clipViewT(y0 - a[1], dy, t) && d3_geo_clipViewT(a[1] - y1, -dy, t)) {

diff --git a/d3.min.js b/d3.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "A small, free JavaScript library for manipulating documents based on data.",
   "keywords": [
     "dom",

diff --git a/src/geo/clip-view.js b/src/geo/clip-view.js
@@ -3,7 +3,7 @@ import "../math/trigonometry";
 import "clip";
 import "clip-polygon";
 
-var d3_geo_clipViewMAX = 1e15;
+var d3_geo_clipViewMAX = 1e9;
 
 function d3_geo_clipView(x0, y0, x1, y1) {
   return function(listener) {
@@ -113,6 +113,8 @@ function d3_geo_clipView(x0, y0, x1, y1) {
     }
 
     function linePoint(x, y) {
+      x = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, x));
+      y = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, y));
       var v = visible(x, y);
       if (polygon) ring.push([x, y]);
       if (first) {
@@ -169,11 +171,6 @@ function d3_geo_clipView(x0, y0, x1, y1) {
 
   // Liang–Barsky line clipping.
   function clipLine(a, b) {
-    a[0] = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, a[0]));
-    a[1] = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, a[1]));
-    b[0] = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, b[0]));
-    b[1] = Math.max(-d3_geo_clipViewMAX, Math.min(d3_geo_clipViewMAX, b[1]));
-
     var dx = b[0] - a[0],
         dy = b[1] - a[1],
         t = [0, 1];

diff --git a/src/start.js b/src/start.js
@@ -1,2 +1,2 @@
 d3 = (function(){
-  var d3 = {version: "3.1.0"}; // semver
+  var d3 = {version: "3.1.1"}; // semver