Update to 2.2.0.

Laurian · Sep 18, 2011 · 661d8f7 · 661d8f7
1 parent 49ba8be
commit 661d8f7
Show file tree

Hide file tree

Showing 27 changed files with 137 additions and 88 deletions.
diff --git a/_layouts/api.html b/_layouts/api.html
@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html;charset=utf-8">
     <title>d3.js{% if page.title %} ~ {{ page.title }}{% endif %}</title>
-    <script type="text/javascript" src="../d3.js?2.1.3"></script>
+    <script type="text/javascript" src="../d3.js?2.2.0"></script>
     <style type="text/css">
 
 @import url("../style.css?1.10.0");

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html;charset=utf-8">
     <title>d3.js{% if page.title %} ~ {{ page.title }}{% endif %}</title>
-    <script type="text/javascript" src="d3.js?2.1.3"></script>
+    <script type="text/javascript" src="d3.js?2.2.0"></script>
     <style type="text/css">
 
 @import url("style.css?1.10.0");

diff --git a/_layouts/ex.html b/_layouts/ex.html
@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html;charset=utf-8">
     <title>d3.js{% if page.title %} ~ {{ page.title }}{% endif %}</title>
-    <script type="text/javascript" src="../d3.js?2.1.3"></script>
+    <script type="text/javascript" src="../d3.js?2.2.0"></script>
     <style type="text/css">
 
 @import url("../style.css?1.10.0");

diff --git a/_layouts/tutorial.html b/_layouts/tutorial.html
@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html;charset=utf-8">
     <title>d3.js{% if page.title %} ~ {{ page.title }}{% endif %}</title>
-    <script type="text/javascript" src="../d3.js?2.1.3"></script>
+    <script type="text/javascript" src="../d3.js?2.2.0"></script>
     <style type="text/css">
 
 @import url("../style.css?1.10.0");

diff --git a/d3.geo.js b/d3.geo.js
@@ -197,6 +197,42 @@ d3.geo.albersUsa = function() {
 };
 
 var d3_radians = Math.PI / 180;
+d3.geo.equirectangular = function() {
+  var scale = 500,
+      translate = [480, 250];
+
+  function equirectangular(coordinates) {
+    var x = coordinates[0] / 360,
+        y = -coordinates[1] / 360;
+    return [
+      scale * x + translate[0],
+      scale * y + translate[1]
+    ];
+  }
+
+  equirectangular.invert = function(coordinates) {
+    var x = (coordinates[0] - translate[0]) / scale,
+        y = (coordinates[1] - translate[1]) / scale;
+    return [
+      360 * x,
+      -360 * y
+    ];
+  };
+
+  equirectangular.scale = function(x) {
+    if (!arguments.length) return scale;
+    scale = +x;
+    return equirectangular;
+  };
+
+  equirectangular.translate = function(x) {
+    if (!arguments.length) return translate;
+    translate = [+x[0], +x[1]];
+    return equirectangular;
+  };
+
+  return equirectangular;
+};
 d3.geo.mercator = function() {
   var scale = 500,
       translate = [480, 250];

diff --git a/d3.geo.min.js b/d3.geo.min.js
diff --git a/d3.js b/d3.js
@@ -10,7 +10,7 @@ try {
     d3_style_setProperty.call(this, name, value + "", priority);
   };
 }
-d3 = {version: "2.1.3"}; // semver
+d3 = {version: "2.2.0"}; // semver
 var d3_arraySubclass = [].__proto__?
 
 // Until ECMAScript supports array subclassing, prototype injection works well.
@@ -2775,33 +2775,30 @@ var d3_svg_lineInterpolators = {
 
 // Linear interpolation; generates "L" commands.
 function d3_svg_lineLinear(points) {
-  var path = [],
-      i = 0,
+  var i = 0,
       n = points.length,
-      p = points[0];
-  path.push(p[0], ",", p[1]);
+      p = points[0],
+      path = [p[0], ",", p[1]];
   while (++i < n) path.push("L", (p = points[i])[0], ",", p[1]);
   return path.join("");
 }
 
 // Step interpolation; generates "H" and "V" commands.
 function d3_svg_lineStepBefore(points) {
-  var path = [],
-      i = 0,
+  var i = 0,
       n = points.length,
-      p = points[0];
-  path.push(p[0], ",", p[1]);
+      p = points[0],
+      path = [p[0], ",", p[1]];
   while (++i < n) path.push("V", (p = points[i])[1], "H", p[0]);
   return path.join("");
 }
 
 // Step interpolation; generates "H" and "V" commands.
 function d3_svg_lineStepAfter(points) {
-  var path = [],
-      i = 0,
+  var i = 0,
       n = points.length,
-      p = points[0];
-  path.push(p[0], ",", p[1]);
+      p = points[0],
+      path = [p[0], ",", p[1]];
   while (++i < n) path.push("H", (p = points[i])[0], "V", p[1]);
   return path.join("");
 }
@@ -2899,15 +2896,14 @@ function d3_svg_lineCardinalTangents(points, tension) {
 // B-spline interpolation; generates "C" commands.
 function d3_svg_lineBasis(points) {
   if (points.length < 3) return d3_svg_lineLinear(points);
-  var path = [],
-      i = 1,
+  var i = 1,
       n = points.length,
       pi = points[0],
       x0 = pi[0],
       y0 = pi[1],
       px = [x0, x0, x0, (pi = points[1])[0]],
-      py = [y0, y0, y0, pi[1]];
-  path.push(x0, ",", y0);
+      py = [y0, y0, y0, pi[1]],
+      path = [x0, ",", y0];
   d3_svg_lineBasisBezier(path, px, py);
   while (++i < n) {
     pi = points[i];