Allow ol.control.ScaleLine units option to be a string

This commit is contained in:
Tom Payne
2014-02-06 19:34:15 +01:00
parent 2cef7b98fd
commit 84fd853dc1
2 changed files with 4 additions and 3 deletions

View File

@@ -236,8 +236,8 @@
* @property {string|undefined} className CSS Class name. Default is `ol-scale-line`.
* @property {number|undefined} minWidth Minimum width in pixels. Default is `64`.
* @property {Element|undefined} target Target.
* @property {ol.control.ScaleLineUnits|undefined} units Units.
* Default is `ol.control.ScaleLineUnits.METRIC`.
* @property {ol.control.ScaleLineUnits|string|undefined} units Units.
* Default is `metric`.
* @todo stability experimental
*/

View File

@@ -122,7 +122,8 @@ ol.control.ScaleLine = function(opt_options) {
this, ol.Object.getChangeEventType(ol.control.ScaleLineProperty.UNITS),
this.handleUnitsChanged_, false, this);
this.setUnits(options.units || ol.control.ScaleLineUnits.METRIC);
this.setUnits(/** @type {ol.control.ScaleLineUnits} */ (options.units) ||
ol.control.ScaleLineUnits.METRIC);
};
goog.inherits(ol.control.ScaleLine, ol.control.Control);