Merge branch 'fix-transverse-mercator-center'

slyubomirsky · Jul 17, 2014 · 48ad44f · 48ad44f
2 parents a30a79a + f5c380b
commit 48ad44f
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "3.4.10",
+  "version": "3.4.11",
   "main": "d3.js",
   "scripts": [
     "d3.js"

diff --git a/component.json b/component.json
@@ -10,7 +10,7 @@
     "animation",
     "canvas"
   ],
-  "version": "3.4.10",
+  "version": "3.4.11",
   "main": "d3.js",
   "scripts": [
     "d3.js"

diff --git a/d3.js b/d3.js
@@ -1,6 +1,6 @@
 !function() {
   var d3 = {
-    version: "3.4.10"
+    version: "3.4.11"
   };
   if (!Date.now) Date.now = function() {
     return +new Date();
@@ -4680,13 +4680,13 @@
   (d3.geo.transverseMercator = function() {
     var projection = d3_geo_mercatorProjection(d3_geo_transverseMercator), center = projection.center, rotate = projection.rotate;
     projection.center = function(_) {
-      return _ ? center([ -_[1], _[0] ]) : (_ = center(), [ -_[1], _[0] ]);
+      return _ ? center([ -_[1], _[0] ]) : (_ = center(), [ _[1], -_[0] ]);
     };
     projection.rotate = function(_) {
       return _ ? rotate([ _[0], _[1], _.length > 2 ? _[2] + 90 : 90 ]) : (_ = rotate(), 
       [ _[0], _[1], _[2] - 90 ]);
     };
-    return projection.rotate([ 0, 0 ]);
+    return rotate([ 0, 0, 90 ]);
   }).raw = d3_geo_transverseMercator;
   d3.geom = {};
   function d3_geom_pointX(d) {

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.4.10",
+  "version": "3.4.11",
   "description": "A small, free JavaScript library for manipulating documents based on data.",
   "keywords": [
     "dom",

diff --git a/src/geo/transverse-mercator.js b/src/geo/transverse-mercator.js
@@ -18,7 +18,7 @@ d3_geo_transverseMercator.invert = function(x, y) {
   projection.center = function(_) {
     return _
         ? center([-_[1], _[0]])
-        : ((_ = center()), [-_[1], _[0]]);
+        : ((_ = center()), [_[1], -_[0]]);
   };
 
   projection.rotate = function(_) {
@@ -27,5 +27,5 @@ d3_geo_transverseMercator.invert = function(x, y) {
         : ((_ = rotate()), [_[0], _[1], _[2] - 90]);
   };
 
-  return projection.rotate([0, 0]);
+  return rotate([0, 0, 90]);
 }).raw = d3_geo_transverseMercator;
diff --git a/src/start.js b/src/start.js
@@ -1,2 +1,2 @@
 !function(){
-  var d3 = {version: "3.4.10"}; // semver
+  var d3 = {version: "3.4.11"}; // semver
diff --git a/test/geo/transverse-mercator-test.js b/test/geo/transverse-mercator-test.js
@@ -8,6 +8,13 @@ var suite = vows.describe("d3.geo.transverseMercator");
 suite.addBatch({
   "transverseMercator": {
     topic: load("geo/transverse-mercator").expression("d3.geo.transverseMercator"),
+    "returns the expected rotation": function(projection) {
+      assert.deepEqual(projection().rotate([13, 27]).rotate(), [13, 27, 0]);
+      assert.deepEqual(projection().rotate([13, 27, 45]).rotate(), [13, 27, 45]);
+    },
+    "returns the expected center": function(projection) {
+      assert.deepEqual(projection().center([13, 27]).center(), [13, 27]);
+    },
     "default": projectionTestSuite({
       topic: function(projection) { return projection(); }
     }, {