diff --git a/src/ol/map.js b/src/ol/map.js index 18db122937..a3171762bb 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -30,7 +30,6 @@ goog.require('ol.has'); goog.require('ol.interaction'); goog.require('ol.layer.Group'); goog.require('ol.obj'); -goog.require('ol.proj.common'); goog.require('ol.renderer.Map'); goog.require('ol.renderer.Type'); goog.require('ol.renderer.canvas.Map'); @@ -1501,5 +1500,3 @@ ol.Map.createOptionsInternal = function(options) { }; }; - -ol.proj.common.add(); diff --git a/src/ol/proj.js b/src/ol/proj.js index 4562585174..013885ab32 100644 --- a/src/ol/proj.js +++ b/src/ol/proj.js @@ -2,6 +2,8 @@ goog.provide('ol.proj'); goog.require('ol'); goog.require('ol.extent'); +goog.require('ol.proj.EPSG3857'); +goog.require('ol.proj.EPSG4326'); goog.require('ol.proj.Projection'); goog.require('ol.proj.Units'); goog.require('ol.proj.proj4'); @@ -467,3 +469,24 @@ ol.proj.transformWithProjections = function(point, sourceProjection, destination sourceProjection, destinationProjection); return transformFn(point); }; + +/** + * Add transforms to and from EPSG:4326 and EPSG:3857. This function is called + * by when this module is executed and should only need to be called again after + * `ol.proj.clearAllProjections()` is called (e.g. in tests). + */ +ol.proj.addCommon = function() { + // Add transformations that don't alter coordinates to convert within set of + // projections with equal meaning. + ol.proj.addEquivalentProjections(ol.proj.EPSG3857.PROJECTIONS); + ol.proj.addEquivalentProjections(ol.proj.EPSG4326.PROJECTIONS); + // Add transformations to convert EPSG:4326 like coordinates to EPSG:3857 like + // coordinates and back. + ol.proj.addEquivalentTransforms( + ol.proj.EPSG4326.PROJECTIONS, + ol.proj.EPSG3857.PROJECTIONS, + ol.proj.EPSG3857.fromEPSG4326, + ol.proj.EPSG3857.toEPSG4326); +}; + +ol.proj.addCommon(); diff --git a/src/ol/proj/common.js b/src/ol/proj/common.js index 96e57dff68..7c27ff9477 100644 --- a/src/ol/proj/common.js +++ b/src/ol/proj/common.js @@ -1,24 +1,13 @@ goog.provide('ol.proj.common'); goog.require('ol.proj'); -goog.require('ol.proj.EPSG3857'); -goog.require('ol.proj.EPSG4326'); /** - * FIXME empty description for jsdoc + * Deprecated. Transforms between EPSG:4326 and EPSG:3857 are now included by + * default. There is no need to call this function in application code and it + * will be removed in a future major release. + * @deprecated This function is no longer necessary. * @api */ -ol.proj.common.add = function() { - // Add transformations that don't alter coordinates to convert within set of - // projections with equal meaning. - ol.proj.addEquivalentProjections(ol.proj.EPSG3857.PROJECTIONS); - ol.proj.addEquivalentProjections(ol.proj.EPSG4326.PROJECTIONS); - // Add transformations to convert EPSG:4326 like coordinates to EPSG:3857 like - // coordinates and back. - ol.proj.addEquivalentTransforms( - ol.proj.EPSG4326.PROJECTIONS, - ol.proj.EPSG3857.PROJECTIONS, - ol.proj.EPSG3857.fromEPSG4326, - ol.proj.EPSG3857.toEPSG4326); -}; +ol.proj.common.add = ol.proj.addCommon; diff --git a/test/spec/ol/proj/epsg3857.test.js b/test/spec/ol/proj/epsg3857.test.js index 7dc47dcf9b..e6279994bd 100644 --- a/test/spec/ol/proj/epsg3857.test.js +++ b/test/spec/ol/proj/epsg3857.test.js @@ -1,13 +1,12 @@ goog.provide('ol.test.proj.EPSG3857'); goog.require('ol.proj'); -goog.require('ol.proj.common'); describe('ol.proj.EPSG3857', function() { afterEach(function() { ol.proj.clearAllProjections(); - ol.proj.common.add(); + ol.proj.addCommon(); }); describe('fromEPSG4326()', function() { diff --git a/test/spec/ol/proj/index.test.js b/test/spec/ol/proj/index.test.js index 6f2cb44de7..122e6b996f 100644 --- a/test/spec/ol/proj/index.test.js +++ b/test/spec/ol/proj/index.test.js @@ -3,14 +3,13 @@ goog.provide('ol.test.proj'); goog.require('ol.proj'); goog.require('ol.proj.EPSG4326'); goog.require('ol.proj.Projection'); -goog.require('ol.proj.common'); describe('ol.proj', function() { afterEach(function() { ol.proj.clearAllProjections(); - ol.proj.common.add(); + ol.proj.addCommon(); }); describe('projection equivalence', function() { diff --git a/test/spec/ol/renderer/webgl/imagelayer.test.js b/test/spec/ol/renderer/webgl/imagelayer.test.js index b680cef075..241eaf326c 100644 --- a/test/spec/ol/renderer/webgl/imagelayer.test.js +++ b/test/spec/ol/renderer/webgl/imagelayer.test.js @@ -2,7 +2,6 @@ goog.provide('ol.test.renderer.webgl.ImageLayer'); goog.require('ol.transform'); goog.require('ol.Map'); -goog.require('ol.proj.common'); goog.require('ol.layer.Image'); goog.require('ol.source.Image'); goog.require('ol.renderer.webgl.ImageLayer'); @@ -21,8 +20,6 @@ describe('ol.renderer.webgl.ImageLayer', function() { var imageExtent; beforeEach(function() { - ol.proj.common.add(); - map = new ol.Map({ target: document.createElement('div') });