From 093b61dc68f89d79fa6a5d1a6aec16f8a3f286ce Mon Sep 17 00:00:00 2001
From: David Manthey <david.manthey@kitware.com>
Date: Thu, 13 Oct 2016 08:04:09 -0400
Subject: [PATCH] boundsFromZoomAndCenter returned incorrect values.

When using any gcs other than the map's gcs, the function performed two conversions on the map center's coordinates which resulted in erroneous results.
---
 src/map.js         |  2 +-
 tests/cases/map.js | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/map.js b/src/map.js
index 46ad82c1b3..8ac5f1f986 100644
--- a/src/map.js
+++ b/src/map.js
@@ -1426,7 +1426,7 @@ var map = function (arg) {
     // preprocess the arguments
     zoom = fix_zoom(zoom, ignoreDiscreteZoom);
     units = m_this.unitsPerPixel(zoom);
-    center = m_this.gcsToWorld(center, gcs);
+    center = m_this.gcsToWorld(center, null);
 
     // get half the width and height in world coordinates
     width = m_width * units;
diff --git a/tests/cases/map.js b/tests/cases/map.js
index 29afde6dfc..3c9115ac7a 100644
--- a/tests/cases/map.js
+++ b/tests/cases/map.js
@@ -144,7 +144,7 @@ describe('geo.core.map', function () {
       expect(m.scale()).toEqual({x: 1, y: 1, z: 1});
     });
     it('gcs and ingcs', function () {
-      var m = create_map(), units = m.unitsPerPixel();
+      var m = create_map(), units = m.unitsPerPixel(), bounds;
       var error = console.error;
       expect(m.gcs()).toBe('EPSG:3857');
       expect(m.ingcs()).toBe('EPSG:4326');
@@ -162,6 +162,26 @@ describe('geo.core.map', function () {
         left: -128 * units, top: 128 * units,
         right: 128 * units, bottom: -128 * units,
         width: 256 * units, height: 256 * units})).toBe(true);
+      // test with a different non-zero center
+      m.ingcs('EPSG:4326');
+      m.bounds({left: -180, top: 65, right: -45, bottom: 45});
+      bounds = m.bounds();
+      // compare left, top, right, bottom separately from width and height to
+      // use different precisions in the comparison
+      expect(closeToEqual({
+        left: bounds.left, top: bounds.top,
+        right: bounds.right, bottom: bounds.bottom
+      }, {
+        left: -180, top: 79.340, right: -45, bottom: 0.906
+      })).toBe(true);
+      expect(closeToEqual({width: bounds.width, height: bounds.height}, {
+        width: 96 * units, height: 96 * units}, -2)).toBe(true);
+      expect(closeToEqual(m.bounds(undefined, null), {
+        left: -128 * units, top: 96.6444 * units,
+        right: -32 * units, bottom: 0.6444 * units,
+        width: 96 * units, height: 96 * units}, -2)).toBe(true);
+      m.bounds({left: -180, top: 5, right: 180, bottom: -5});
+      // test with different projections
       m.unitsPerPixel(0, 1);
       m.gcs('+proj=longlat +axis=enu');
       expect(m.gcs()).toBe('+proj=longlat +axis=enu');