From e7c2d9ab32ac0abdba3714a21a533c02ed98099d Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Thu, 2 Jun 2016 17:02:25 +0200 Subject: [PATCH] Don't dispatch select event if no feature is selected or deselected --- src/ol/interaction/selectinteraction.js | 9 ++------- .../spec/ol/interaction/selectinteraction.test.js | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/ol/interaction/selectinteraction.js b/src/ol/interaction/selectinteraction.js index 9cb3e83caa..2fa7af1729 100644 --- a/src/ol/interaction/selectinteraction.js +++ b/src/ol/interaction/selectinteraction.js @@ -263,7 +263,6 @@ ol.interaction.Select.handleEvent = function(mapBrowserEvent) { var features = this.featureOverlay_.getSource().getFeaturesCollection(); var deselected = []; var selected = []; - var change = false; if (set) { // Replace the currently selected feature(s) with the feature(s) at the // pixel, or clear the selected feature(s) if there is no feature at @@ -284,9 +283,8 @@ ol.interaction.Select.handleEvent = function(mapBrowserEvent) { }, this, this.layerFilter_); if (selected.length > 0 && features.getLength() == 1 && features.item(0) == selected[0]) { - // No change + // No change; an already selected feature is selected again } else { - change = true; if (features.getLength() !== 0) { deselected = Array.prototype.concat(features.getArray()); features.clear(); @@ -320,11 +318,8 @@ ol.interaction.Select.handleEvent = function(mapBrowserEvent) { features.remove(deselected[i]); } features.extend(selected); - if (selected.length > 0 || deselected.length > 0) { - change = true; - } } - if (change) { + if (selected.length > 0 || deselected.length > 0) { this.dispatchEvent( new ol.interaction.SelectEvent(ol.interaction.SelectEventType.SELECT, selected, deselected, mapBrowserEvent)); diff --git a/test/spec/ol/interaction/selectinteraction.test.js b/test/spec/ol/interaction/selectinteraction.test.js index 3168d78eb2..83af9fe076 100644 --- a/test/spec/ol/interaction/selectinteraction.test.js +++ b/test/spec/ol/interaction/selectinteraction.test.js @@ -130,6 +130,21 @@ describe('ol.interaction.Select', function() { expect(features.getLength()).to.equal(1); }); + it('single-click outside the geometry', function() { + var listenerSpy = sinon.spy(function(e) { + expect(e.selected).to.have.length(1); + }); + select.on('select', listenerSpy); + + simulateEvent(ol.MapBrowserEvent.EventType.SINGLECLICK, -10, -10); + + expect(listenerSpy.callCount).to.be(0); + + var features = select.getFeatures(); + expect(features.getLength()).to.equal(0); + }); + + it('select with shift single-click', function() { var listenerSpy = sinon.spy(function(e) { expect(e.selected).to.have.length(1);