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

Revert to only accept ol.proj.Projection as argument

Browse Source
This commit is contained in:
Andreas Hocevar
2014-07-09 18:12:07 +02:00
parent 1bb5705b55
commit 1ae82b054c
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/proj/proj.js
+8 -22
View File
@@ -258,21 +258,18 @@ ol.proj.transforms_ = {};
* Registers transformation functions that don't alter coordinates. Those allow * Registers transformation functions that don't alter coordinates. Those allow
* to transform between projections with equal meaning. * to transform between projections with equal meaning.
* *
* @param {Array.<ol.proj.Projection|olx.ProjectionOptions>} projections * @param {Array.<ol.proj.Projection>} projections Projections.
* Projections.
* @return {Array.<ol.proj.Projection>} The added equivalent projections.
* @api * @api
*/ */
ol.proj.addEquivalentProjections = function(projections) { ol.proj.addEquivalentProjections = function(projections) {
var addedProjections = ol.proj.addProjections(projections); ol.proj.addProjections(projections);
goog.array.forEach(addedProjections, function(source) { goog.array.forEach(projections, function(source) {
goog.array.forEach(addedProjections, function(destination) { goog.array.forEach(projections, function(destination) {
if (source !== destination) { if (source !== destination) {
ol.proj.addTransform(source, destination, ol.proj.cloneTransform); ol.proj.addTransform(source, destination, ol.proj.cloneTransform);
} }
}); });
}); });
return addedProjections;
}; };
@@ -303,34 +300,23 @@ ol.proj.addEquivalentTransforms =
/** /**
* Add a Projection object to the list of supported projections. * Add a Projection object to the list of supported projections.
* *
* @param {ol.proj.Projection|olx.ProjectionOptions} projection Projection * @param {ol.proj.Projection} projection Projection instance.
* instance or configuration.
* @return {ol.proj.Projection} The added projection.
* @api * @api
*/ */
ol.proj.addProjection = function(projection) { ol.proj.addProjection = function(projection) {
var projections = ol.proj.projections_; ol.proj.projections_[projection.getCode()] = projection;
var proj = projection instanceof ol.proj.Projection ? ol.proj.addTransform(projection, projection, ol.proj.cloneTransform);
projection :
new ol.proj.Projection(/** @type {olx.ProjectionOptions} */ (projection));
var code = proj.getCode();
projections[code] = proj;
ol.proj.addTransform(proj, proj, ol.proj.cloneTransform);
return proj;
}; };
/** /**
* @param {Array.<ol.proj.Projection|olx.ProjectionOptions>} projections * @param {Array.<ol.proj.Projection>} projections Projections.
* Projections.
* @return {Array.<ol.proj.Projection>} The added projections.
*/ */
ol.proj.addProjections = function(projections) { ol.proj.addProjections = function(projections) {
var addedProjections = []; var addedProjections = [];
goog.array.forEach(projections, function(projection) { goog.array.forEach(projections, function(projection) {
addedProjections.push(ol.proj.addProjection(projection)); addedProjections.push(ol.proj.addProjection(projection));
}); });
return addedProjections;
}; };