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

Merge pull request #4736 from ahocevar/fix-select

Browse Source 
Properly detect feature on unmanaged layer for toggle selection
This commit is contained in:
Andreas Hocevar
2016-02-02 08:58:16 +01:00
parent b6fa480c97 ecb2a42900
commit 39b9ba87fc
3 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -323,7 +323,8 @@ ol.interaction.Select.handleEvent = function(mapBrowserEvent) {
* @param {ol.layer.Layer} layer Layer.
*/
function(feature, layer) {
if (layer !== this.featureOverlay_) {
goog.asserts.assertInstanceof(feature, ol.Feature);
if (layer !== null) {
if (add || toggle) {
if (this.filter_(feature, layer) &&
!ol.array.includes(features.getArray(), feature) &&
@@ -332,7 +333,7 @@ ol.interaction.Select.handleEvent = function(mapBrowserEvent) {
this.addFeatureLayerAssociation_(feature, layer);
}
}
} else {
} else if (this.featureOverlay_.getSource().hasFeature(feature)) {
if (remove || toggle) {
deselected.push(feature);
this.removeFeatureLayerAssociation_(feature);

10
src/ol/source/vectorsource.js
View File

@@ -739,6 +739,16 @@ ol.source.Vector.prototype.handleFeatureChange_ = function(event) {
};
/**
* @param {ol.Feature} feature Feature.
* @return {boolean} Feature is in source.
*/
ol.source.Vector.prototype.hasFeature = function(feature) {
var id = feature.getId();
return id ? id in this.idIndex_ : goog.getUid(feature) in this.undefIdIndex_;
};
/**
* @return {boolean} Is empty.
*/