diff --git a/src/ol/control.js b/src/ol/control.js index b8eb66d09b..b770e3a9af 100644 --- a/src/ol/control.js +++ b/src/ol/control.js @@ -3,7 +3,7 @@ */ import _ol_Collection_ from './Collection.js'; import Attribution from './control/Attribution.js'; -import _ol_control_Rotate_ from './control/Rotate.js'; +import Rotate from './control/Rotate.js'; import _ol_control_Zoom_ from './control/Zoom.js'; var _ol_control_ = {}; @@ -33,7 +33,7 @@ _ol_control_.defaults = function(opt_options) { var rotateControl = options.rotate !== undefined ? options.rotate : true; if (rotateControl) { - controls.push(new _ol_control_Rotate_(options.rotateOptions)); + controls.push(new Rotate(options.rotateOptions)); } var attributionControl = options.attribution !== undefined ? diff --git a/src/ol/control/Rotate.js b/src/ol/control/Rotate.js index 6f58733953..3e792537a3 100644 --- a/src/ol/control/Rotate.js +++ b/src/ol/control/Rotate.js @@ -20,7 +20,7 @@ import {inherits} from '../index.js'; * @param {olx.control.RotateOptions=} opt_options Rotate options. * @api */ -var _ol_control_Rotate_ = function(opt_options) { +var Rotate = function(opt_options) { var options = opt_options ? opt_options : {}; @@ -52,7 +52,7 @@ var _ol_control_Rotate_ = function(opt_options) { button.appendChild(this.label_); _ol_events_.listen(button, _ol_events_EventType_.CLICK, - _ol_control_Rotate_.prototype.handleClick_, this); + Rotate.prototype.handleClick_, this); var cssClasses = className + ' ' + _ol_css_.CLASS_UNSELECTABLE + ' ' + _ol_css_.CLASS_CONTROL; @@ -60,7 +60,7 @@ var _ol_control_Rotate_ = function(opt_options) { element.className = cssClasses; element.appendChild(button); - var render = options.render ? options.render : _ol_control_Rotate_.render; + var render = options.render ? options.render : Rotate.render; this.callResetNorth_ = options.resetNorth ? options.resetNorth : undefined; @@ -94,14 +94,14 @@ var _ol_control_Rotate_ = function(opt_options) { }; -inherits(_ol_control_Rotate_, Control); +inherits(Rotate, Control); /** * @param {Event} event The event to handle * @private */ -_ol_control_Rotate_.prototype.handleClick_ = function(event) { +Rotate.prototype.handleClick_ = function(event) { event.preventDefault(); if (this.callResetNorth_ !== undefined) { this.callResetNorth_(); @@ -114,7 +114,7 @@ _ol_control_Rotate_.prototype.handleClick_ = function(event) { /** * @private */ -_ol_control_Rotate_.prototype.resetNorth_ = function() { +Rotate.prototype.resetNorth_ = function() { var map = this.getMap(); var view = map.getView(); if (!view) { @@ -142,7 +142,7 @@ _ol_control_Rotate_.prototype.resetNorth_ = function() { * @this {ol.control.Rotate} * @api */ -_ol_control_Rotate_.render = function(mapEvent) { +Rotate.render = function(mapEvent) { var frameState = mapEvent.frameState; if (!frameState) { return; @@ -164,4 +164,4 @@ _ol_control_Rotate_.render = function(mapEvent) { } this.rotation_ = rotation; }; -export default _ol_control_Rotate_; +export default Rotate; diff --git a/test/spec/ol/control/rotate.test.js b/test/spec/ol/control/rotate.test.js index 11ed38e5e0..bfa0367df8 100644 --- a/test/spec/ol/control/rotate.test.js +++ b/test/spec/ol/control/rotate.test.js @@ -1,12 +1,12 @@ -import _ol_control_Rotate_ from '../../../../src/ol/control/Rotate.js'; +import Rotate from '../../../../src/ol/control/Rotate.js'; describe('ol.control.Rotate', function() { describe('constructor', function() { it('can be constructed without arguments', function() { - var instance = new _ol_control_Rotate_(); - expect(instance).to.be.an(_ol_control_Rotate_); + var instance = new Rotate(); + expect(instance).to.be.an(Rotate); }); });