ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add common transforms by default

Browse Source
This commit is contained in:
Tim Schaub
2017-03-27 10:07:00 -06:00
parent 03700c0f01
commit 9415899a03
6 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ol/map.js
View File

@@ -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();

23
src/ol/proj.js
View File

@@ -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();

21
src/ol/proj/common.js
View File

@@ -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;

3
test/spec/ol/proj/epsg3857.test.js
View File

@@ -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() {

3
test/spec/ol/proj/index.test.js
View File

@@ -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() {

3
test/spec/ol/renderer/webgl/imagelayer.test.js
View File

@@ -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')
});