Properly detect feature on unmanaged layer

openlayers · Jan 27, 2016 · 4b29e24 · 4b29e24
1 parent 7b78c21
commit 4b29e24
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/ol/interaction/selectinteraction.js b/src/ol/interaction/selectinteraction.js
@@ -323,7 +323,7 @@ ol.interaction.Select.handleEvent = function(mapBrowserEvent) {
          * @param {ol.layer.Layer} layer Layer.
          */
         function(feature, layer) {
-          if (layer !== this.featureOverlay_) {
+          if (layer !== null) {
             if (add || toggle) {
               if (this.filter_(feature, layer) &&
                   !ol.array.includes(features.getArray(), feature) &&
@@ -332,7 +332,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);

diff --git a/src/ol/source/vectorsource.js b/src/ol/source/vectorsource.js
@@ -739,6 +739,17 @@ 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) {
+  goog.asserts.assertInstanceof(feature, ol.Feature);
+  var id = feature.getId();
+  return id ? id in this.idIndex_ : goog.getUid(feature) in this.undefIdIndex_;
+};
+
+
 /**
  * @return {boolean} Is empty.
  */