diff --git a/src/ol/proj/chprojection.js b/src/ol/proj/chprojection.js index 3302674635..3b485b32b4 100644 --- a/src/ol/proj/chprojection.js +++ b/src/ol/proj/chprojection.js @@ -410,7 +410,7 @@ goog.inherits(ol.proj.EPSG2056, ol.proj.CH); * @type {ol.Extent} */ ol.proj.EPSG2056.EXTENT = - [2485869.5728, 2837076.5648, 1076443.1884, 1299941.7864]; + [[2485869.5728, 1076443.1884], [2837076.5648, 1299941.7864]]; /** @@ -447,7 +447,10 @@ goog.inherits(ol.proj.EPSG21781, ol.proj.CH); * @const * @type {ol.Extent} */ -ol.proj.EPSG21781.EXTENT = [485869.5728, 837076.5648, 76443.1884, 299941.7864]; +ol.proj.EPSG21781.EXTENT = [ + [485869.5728, 76443.1884], + [837076.5648, 299941.7864] +]; /** diff --git a/src/ol/proj/epsg3857projection.js b/src/ol/proj/epsg3857projection.js index f9b8ad3c53..8375f889b8 100644 --- a/src/ol/proj/epsg3857projection.js +++ b/src/ol/proj/epsg3857projection.js @@ -44,8 +44,8 @@ ol.proj.EPSG3857.HALF_SIZE = Math.PI * ol.proj.EPSG3857.RADIUS; * @type {ol.Extent} */ ol.proj.EPSG3857.EXTENT = [ - -ol.proj.EPSG3857.HALF_SIZE, ol.proj.EPSG3857.HALF_SIZE, - -ol.proj.EPSG3857.HALF_SIZE, ol.proj.EPSG3857.HALF_SIZE + [-ol.proj.EPSG3857.HALF_SIZE, -ol.proj.EPSG3857.HALF_SIZE], + [ol.proj.EPSG3857.HALF_SIZE, ol.proj.EPSG3857.HALF_SIZE] ]; diff --git a/src/ol/proj/epsg4326projection.js b/src/ol/proj/epsg4326projection.js index 7257255143..4acedbede5 100644 --- a/src/ol/proj/epsg4326projection.js +++ b/src/ol/proj/epsg4326projection.js @@ -30,7 +30,7 @@ goog.inherits(ol.proj.EPSG4326, ol.Projection); * @const * @type {ol.Extent} */ -ol.proj.EPSG4326.EXTENT = [-180, 180, -90, 90]; +ol.proj.EPSG4326.EXTENT = [[-180, -90], [180, 90]]; /** diff --git a/test/spec/ol/proj/chprojection.test.js b/test/spec/ol/proj/chprojection.test.js index a4a814c595..b6934a5a9c 100644 --- a/test/spec/ol/proj/chprojection.test.js +++ b/test/spec/ol/proj/chprojection.test.js @@ -90,8 +90,8 @@ describe('ol.proj.EPSG21781', function() { var fromEPSG4326 = ol.proj.getTransform('EPSG:4326', 'EPSG:21781'); var toEPSG4326 = ol.proj.getTransform('EPSG:21781', 'EPSG:4326'); var roundTripped, x, y; - for (x = extent[0]; x < extent[1]; x += 50000) { - for (y = extent[2]; y < extent[3]; y += 50000) { + for (x = extent[0][0]; x < extent[1][0]; x += 50000) { + for (y = extent[0][1]; y < extent[1][1]; y += 50000) { roundTripped = fromEPSG4326(toEPSG4326([x, y])); expect(roundTripped).to.be.an(Array); expect(roundTripped).to.have.length(2); diff --git a/test/spec/ol/proj/proj.test.js b/test/spec/ol/proj/proj.test.js index 4c80a78ec5..116791c831 100644 --- a/test/spec/ol/proj/proj.test.js +++ b/test/spec/ol/proj/proj.test.js @@ -284,7 +284,7 @@ describe('ol.proj', function() { describe('ol.proj.removeTransform()', function() { - var extent = [180, 180, -90, 90]; + var extent = [[180, -90], [180, 90]]; var units = ol.ProjectionUnits.DEGREES; it('removes functions cached by addTransform', function() { @@ -347,7 +347,7 @@ describe('ol.proj', function() { }); it('returns a configured projection', function() { - var extent = [485869.5728, 837076.5648, 76443.1884, 299941.7864]; + var extent = [[485869.5728, 76443.1884], [837076.5648, 299941.7864]]; var epsg21781 = ol.proj.configureProj4jsProjection({ code: 'EPSG:21781', extent: extent