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

Merge pull request #6379 from fredj/overviewmap_target

Browse Source 
Set the overview map target in ol.control.OverviewMap.setMap
This commit is contained in:
Frédéric Junod
2017-01-18 16:16:03 +01:00
committed by GitHub
parent b23b6984d0 21593503c6
commit d0da44e26d
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ol/control/overviewmap.js
View File

@@ -89,8 +89,12 @@ ol.control.OverviewMap = function(opt_options) {
ol.events.listen(button, ol.events.EventType.CLICK, ol.events.listen(button, ol.events.EventType.CLICK,
this.handleClick_, this); this.handleClick_, this);
var ovmapDiv = document.createElement('DIV'); /**
ovmapDiv.className = 'ol-overviewmap-map'; * @type {Element}
* @private
*/
this.ovmapDiv_ = document.createElement('DIV');
this.ovmapDiv_.className = 'ol-overviewmap-map';
/** /**
* @type {ol.Map} * @type {ol.Map}
@@ -99,7 +103,6 @@ ol.control.OverviewMap = function(opt_options) {
this.ovmap_ = new ol.Map({ this.ovmap_ = new ol.Map({
controls: new ol.Collection(), controls: new ol.Collection(),
interactions: new ol.Collection(), interactions: new ol.Collection(),
target: ovmapDiv,
view: options.view view: options.view
}); });
var ovmap = this.ovmap_; var ovmap = this.ovmap_;
@@ -135,7 +138,7 @@ ol.control.OverviewMap = function(opt_options) {
(this.collapsible_ ? '' : ' ol-uncollapsible'); (this.collapsible_ ? '' : ' ol-uncollapsible');
var element = document.createElement('div'); var element = document.createElement('div');
element.className = cssClasses; element.className = cssClasses;
element.appendChild(ovmapDiv); element.appendChild(this.ovmapDiv_);
element.appendChild(button); element.appendChild(button);
var render = options.render ? options.render : ol.control.OverviewMap.render; var render = options.render ? options.render : ol.control.OverviewMap.render;
@@ -163,10 +166,12 @@ ol.control.OverviewMap.prototype.setMap = function(map) {
if (oldView) { if (oldView) {
this.unbindView_(oldView); this.unbindView_(oldView);
} }
this.ovmap_.setTarget(null);
} }
ol.control.Control.prototype.setMap.call(this, map); ol.control.Control.prototype.setMap.call(this, map);
if (map) { if (map) {
this.ovmap_.setTarget(this.ovmapDiv_);
this.listenerKeys.push(ol.events.listen( this.listenerKeys.push(ol.events.listen(
map, ol.ObjectEventType.PROPERTYCHANGE, map, ol.ObjectEventType.PROPERTYCHANGE,
this.handleMapPropertyChange_, this)); this.handleMapPropertyChange_, this));

12
test/spec/ol/control/overviewmap.test.js
View File

@@ -87,6 +87,18 @@ describe('ol.control.OverviewMap', function() {
expect(ovView.getRotation()).to.be(Math.PI / 8); expect(ovView.getRotation()).to.be(Math.PI / 8);
}); });
it('set target to null', function() {
var control = new ol.control.OverviewMap();
map.addControl(control);
expect(control.ovmap_.getTarget()).not.to.be(null);
map.removeControl(control);
expect(control.ovmap_.getTarget()).to.be(null);
});
}); });
}); });