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

Rename _ol_control_ScaleLineUnits_ to ScaleLineUnits

Browse Source
This commit is contained in:
Tim Schaub
2017-12-14 13:06:52 -07:00
parent b79ead82d2
commit 4200f8e73e
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
import _ol_Object_ from '../Object.js'; import _ol_Object_ from '../Object.js';
import _ol_asserts_ from '../asserts.js'; import _ol_asserts_ from '../asserts.js';
import Control from '../control/Control.js'; import Control from '../control/Control.js';
import _ol_control_ScaleLineUnits_ from '../control/ScaleLineUnits.js'; import ScaleLineUnits from '../control/ScaleLineUnits.js';
import _ol_css_ from '../css.js'; import _ol_css_ from '../css.js';
import _ol_events_ from '../events.js'; import _ol_events_ from '../events.js';
import {getPointResolution, METERS_PER_UNIT} from '../proj.js'; import {getPointResolution, METERS_PER_UNIT} from '../proj.js';
@@ -90,7 +90,7 @@ var ScaleLine = function(opt_options) {
this.handleUnitsChanged_, this); this.handleUnitsChanged_, this);
this.setUnits(/** @type {ol.control.ScaleLineUnits} */ (options.units) || this.setUnits(/** @type {ol.control.ScaleLineUnits} */ (options.units) ||
_ol_control_ScaleLineUnits_.METRIC); ScaleLineUnits.METRIC);
}; };
@@ -171,18 +171,18 @@ ScaleLine.prototype.updateElement_ = function() {
var center = viewState.center; var center = viewState.center;
var projection = viewState.projection; var projection = viewState.projection;
var units = this.getUnits(); var units = this.getUnits();
var pointResolutionUnits = units == _ol_control_ScaleLineUnits_.DEGREES ? var pointResolutionUnits = units == ScaleLineUnits.DEGREES ?
_ol_proj_Units_.DEGREES : _ol_proj_Units_.DEGREES :
_ol_proj_Units_.METERS; _ol_proj_Units_.METERS;
var pointResolution = var pointResolution =
getPointResolution(projection, viewState.resolution, center, pointResolutionUnits); getPointResolution(projection, viewState.resolution, center, pointResolutionUnits);
if (units != _ol_control_ScaleLineUnits_.DEGREES) { if (units != ScaleLineUnits.DEGREES) {
pointResolution *= projection.getMetersPerUnit(); pointResolution *= projection.getMetersPerUnit();
} }
var nominalCount = this.minWidth_ * pointResolution; var nominalCount = this.minWidth_ * pointResolution;
var suffix = ''; var suffix = '';
if (units == _ol_control_ScaleLineUnits_.DEGREES) { if (units == ScaleLineUnits.DEGREES) {
var metersPerDegree = METERS_PER_UNIT[_ol_proj_Units_.DEGREES]; var metersPerDegree = METERS_PER_UNIT[_ol_proj_Units_.DEGREES];
if (projection.getUnits() == _ol_proj_Units_.DEGREES) { if (projection.getUnits() == _ol_proj_Units_.DEGREES) {
nominalCount *= metersPerDegree; nominalCount *= metersPerDegree;
@@ -198,7 +198,7 @@ ScaleLine.prototype.updateElement_ = function() {
} else { } else {
suffix = '\u00b0'; // degrees suffix = '\u00b0'; // degrees
} }
} else if (units == _ol_control_ScaleLineUnits_.IMPERIAL) { } else if (units == ScaleLineUnits.IMPERIAL) {
if (nominalCount < 0.9144) { if (nominalCount < 0.9144) {
suffix = 'in'; suffix = 'in';
pointResolution /= 0.0254; pointResolution /= 0.0254;
@@ -209,10 +209,10 @@ ScaleLine.prototype.updateElement_ = function() {
suffix = 'mi'; suffix = 'mi';
pointResolution /= 1609.344; pointResolution /= 1609.344;
} }
} else if (units == _ol_control_ScaleLineUnits_.NAUTICAL) { } else if (units == ScaleLineUnits.NAUTICAL) {
pointResolution /= 1852; pointResolution /= 1852;
suffix = 'nm'; suffix = 'nm';
} else if (units == _ol_control_ScaleLineUnits_.METRIC) { } else if (units == ScaleLineUnits.METRIC) {
if (nominalCount < 0.001) { if (nominalCount < 0.001) {
suffix = 'μm'; suffix = 'μm';
pointResolution *= 1000000; pointResolution *= 1000000;
@@ -225,7 +225,7 @@ ScaleLine.prototype.updateElement_ = function() {
suffix = 'km'; suffix = 'km';
pointResolution /= 1000; pointResolution /= 1000;
} }
} else if (units == _ol_control_ScaleLineUnits_.US) { } else if (units == ScaleLineUnits.US) {
if (nominalCount < 0.9144) { if (nominalCount < 0.9144) {
suffix = 'in'; suffix = 'in';
pointResolution *= 39.37; pointResolution *= 39.37;

5
src/ol/control/ScaleLineUnits.js
View File

@@ -1,17 +1,16 @@
/** /**
* @module ol/control/ScaleLineUnits * @module ol/control/ScaleLineUnits
*/ */
/** /**
* Units for the scale line. Supported values are `'degrees'`, `'imperial'`, * Units for the scale line. Supported values are `'degrees'`, `'imperial'`,
* `'nautical'`, `'metric'`, `'us'`. * `'nautical'`, `'metric'`, `'us'`.
* @enum {string} * @enum {string}
*/ */
var _ol_control_ScaleLineUnits_ = { export default {
DEGREES: 'degrees', DEGREES: 'degrees',
IMPERIAL: 'imperial', IMPERIAL: 'imperial',
NAUTICAL: 'nautical', NAUTICAL: 'nautical',
METRIC: 'metric', METRIC: 'metric',
US: 'us' US: 'us'
}; };
export default _ol_control_ScaleLineUnits_;