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

Rename _ol_proj_Units_ to Units

Browse Source
This commit is contained in:
Tim Schaub
2018-01-08 09:56:43 -07:00
parent a18f0590f6
commit a04144c3c2
10 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ol/control/ScaleLine.js
View File

@@ -9,7 +9,7 @@ import ScaleLineUnits from '../control/ScaleLineUnits.js';
import {CLASS_UNSELECTABLE} from '../css.js';
import _ol_events_ from '../events.js';
import {getPointResolution, METERS_PER_UNIT} from '../proj.js';
import _ol_proj_Units_ from '../proj/Units.js';
import Units from '../proj/Units.js';
/**
* @classdesc
@@ -172,8 +172,8 @@ ScaleLine.prototype.updateElement_ = function() {
var projection = viewState.projection;
var units = this.getUnits();
var pointResolutionUnits = units == ScaleLineUnits.DEGREES ?
_ol_proj_Units_.DEGREES :
_ol_proj_Units_.METERS;
Units.DEGREES :
Units.METERS;
var pointResolution =
getPointResolution(projection, viewState.resolution, center, pointResolutionUnits);
if (units != ScaleLineUnits.DEGREES) {
@@ -183,8 +183,8 @@ ScaleLine.prototype.updateElement_ = function() {
var nominalCount = this.minWidth_ * pointResolution;
var suffix = '';
if (units == ScaleLineUnits.DEGREES) {
var metersPerDegree = METERS_PER_UNIT[_ol_proj_Units_.DEGREES];
if (projection.getUnits() == _ol_proj_Units_.DEGREES) {
var metersPerDegree = METERS_PER_UNIT[Units.DEGREES];
if (projection.getUnits() == Units.DEGREES) {
nominalCount *= metersPerDegree;
} else {
pointResolution /= metersPerDegree;