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

Merge pull request #815 from tschaub/override

Browse Source 
Override for clarity
This commit is contained in:
Tim Schaub
2013-06-24 14:38:26 -07:00
parent 388967d00c bb915cbf3d
commit d1eec80324
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/ol/proj/proj.js
View File

@@ -139,19 +139,12 @@ ol.Projection.prototype.getUnits = function() {
/**
* Get the amount of meters per unit of this projection.
* @return {number} Meters.
* Get the amount of meters per unit of this projection. If the projection is
* not configured with a units identifier, the return is `undefined`.
* @return {number|undefined} Meters.
*/
ol.Projection.prototype.getMetersPerUnit = function() {
var metersPerUnit;
if (!goog.isNull(this.units_)) {
metersPerUnit = ol.METERS_PER_UNIT[this.units_];
} else {
if (this instanceof ol.Proj4jsProjection_) {
metersPerUnit = this.getProj4jsProj().to_meter;
}
}
return metersPerUnit;
return ol.METERS_PER_UNIT[this.units_];
};
@@ -231,6 +224,18 @@ ol.Proj4jsProjection_ = function(proj4jsProj, options) {
goog.inherits(ol.Proj4jsProjection_, ol.Projection);
/**
* @inheritDoc
*/
ol.Proj4jsProjection_.prototype.getMetersPerUnit = function() {
var metersPerUnit = this.proj4jsProj_.to_meter;
if (!goog.isDef(metersPerUnit)) {
metersPerUnit = ol.METERS_PER_UNIT[this.units_];
}
return metersPerUnit;
};
/**
* @inheritDoc
*/