diff --git a/css/ol.css b/css/ol.css index 157fdeb0b8..cb0bcaae6d 100644 --- a/css/ol.css +++ b/css/ol.css @@ -240,6 +240,6 @@ border: 2px dotted rgba(0,60,136,0.7); } -.ol-overviewmap-interactive .ol-overviewmap-box:hover { +.ol-overviewmap .ol-overviewmap-box:hover { cursor: move; } \ No newline at end of file diff --git a/examples/overviewmap-custom.js b/examples/overviewmap-custom.js index 2f966247e4..abc13e842b 100644 --- a/examples/overviewmap-custom.js +++ b/examples/overviewmap-custom.js @@ -20,8 +20,7 @@ var overviewMapControl = new ol.control.OverviewMap({ ], collapseLabel: '\u00BB', label: '\u00AB', - collapsed: false, - interactive: true + collapsed: false }); var map = new ol.Map({ diff --git a/externs/olx.js b/externs/olx.js index 95d13cd242..d27a5191e2 100644 --- a/externs/olx.js +++ b/externs/olx.js @@ -1201,13 +1201,6 @@ olx.control.OverviewMapOptions.prototype.collapseLabel; */ olx.control.OverviewMapOptions.prototype.collapsible; -/** - * Whether the control is interactive or not. Default to `false`. - * @type {boolean|undefined} - * @api - */ -olx.control.OverviewMapOptions.prototype.interactive; - /** * Text label to use for the collapsed overviewmap button. Default is `ยป`. diff --git a/src/ol/control/overviewmap.js b/src/ol/control/overviewmap.js index 732547ce4a..7dc4f0be36 100644 --- a/src/ol/control/overviewmap.js +++ b/src/ol/control/overviewmap.js @@ -42,20 +42,12 @@ ol.control.OverviewMap = function(opt_options) { this.collapsible_ = options.collapsible !== undefined ? options.collapsible : true; - /** - * @type {boolean} - * @private - */ - this.interactive_ = options.interactive !== undefined ? options.interactive : false; - if (!this.collapsible_) { this.collapsed_ = false; } var className = options.className !== undefined ? options.className : 'ol-overviewmap'; - if (this.interactive_) className += ' ol-overviewmap-interactive'; - var tipLabel = options.tipLabel !== undefined ? options.tipLabel : 'Overview map'; var collapseLabel = options.collapseLabel !== undefined ? options.collapseLabel : '\u00AB'; @@ -154,43 +146,41 @@ ol.control.OverviewMap = function(opt_options) { /* Interactive map */ - if (this.interactive_) { - var scope = this; + var scope = this; - var overlay = this.boxOverlay_; - var overlayBox = this.boxOverlay_.getElement(); + var overlay = this.boxOverlay_; + var overlayBox = this.boxOverlay_.getElement(); - /* Functions definition */ + /* Functions definition */ - var computeDesiredMousePosition = function(mousePosition) { - return { - clientX: mousePosition.clientX - (overlayBox.offsetWidth / 2), - clientY: mousePosition.clientY + (overlayBox.offsetHeight / 2) - }; + var computeDesiredMousePosition = function(mousePosition) { + return { + clientX: mousePosition.clientX - (overlayBox.offsetWidth / 2), + clientY: mousePosition.clientY + (overlayBox.offsetHeight / 2) }; + }; - var move = function(event) { - var coordinates = ovmap.getEventCoordinate(computeDesiredMousePosition(event)); + var move = function(event) { + var coordinates = ovmap.getEventCoordinate(computeDesiredMousePosition(event)); - overlay.setPosition(coordinates); - }; + overlay.setPosition(coordinates); + }; - var endMoving = function(event) { - var coordinates = ovmap.getEventCoordinate(event); + var endMoving = function(event) { + var coordinates = ovmap.getEventCoordinate(event); - scope.getMap().getView().setCenter(coordinates); + scope.getMap().getView().setCenter(coordinates); - window.removeEventListener('mousemove', move); - window.removeEventListener('mouseup', endMoving); - }; + window.removeEventListener('mousemove', move); + window.removeEventListener('mouseup', endMoving); + }; - /* Binding */ + /* Binding */ - overlayBox.addEventListener('mousedown', function() { - window.addEventListener('mousemove', move); - window.addEventListener('mouseup', endMoving); - }); - } + overlayBox.addEventListener('mousedown', function() { + window.addEventListener('mousemove', move); + window.addEventListener('mouseup', endMoving); + }); }; ol.inherits(ol.control.OverviewMap, ol.control.Control);