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

Merge pull request #3309 from bjornharrtell/select-multi-fix

Browse Source 
Fix select event always reporting as multi select
This commit is contained in:
Éric Lemoine
2015-03-04 18:04:15 +01:00
parent b782e0be98 49c2af165a
commit aad727ad14
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ol/interaction/selectinteraction.js
View File

@@ -198,7 +198,8 @@ ol.interaction.Select.handleEvent = function(mapBrowserEvent) {
*/
function(feature, layer) {
selected.push(feature);
}, undefined, this.layerFilter_);
return !this.multi_;
}, this, this.layerFilter_);
if (selected.length > 0 && features.getLength() == 1 &&
features.item(0) == selected[0]) {
// No change
@@ -208,11 +209,7 @@ ol.interaction.Select.handleEvent = function(mapBrowserEvent) {
deselected = Array.prototype.concat(features.getArray());
features.clear();
}
if (this.multi_) {
features.extend(selected);
} else if (selected.length > 0) {
features.push(selected[0]);
}
features.extend(selected);
}
} else {
// Modify the currently selected feature(s).

14
test/spec/ol/interaction/selectinteraction.test.js
View File

@@ -89,8 +89,15 @@ describe('ol.interaction.Select', function() {
});
it('select with single-click', function() {
var listenerSpy = sinon.spy(function(e) {
expect(e.selected).to.have.length(1);
});
select.on('select', listenerSpy);
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20);
expect(listenerSpy.callCount).to.be(1);
var features = select.getFeatures();
expect(features.getLength()).to.equal(1);
});
@@ -107,8 +114,15 @@ describe('ol.interaction.Select', function() {
});
it('select with single-click', function() {
var listenerSpy = sinon.spy(function(e) {
expect(e.selected).to.have.length(2);
});
select.on('select', listenerSpy);
simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, 10, -20);
expect(listenerSpy.callCount).to.be(1);
var features = select.getFeatures();
expect(features.getLength()).to.equal(2);
});