Merge pull request #1298 from ahocevar/gfi-callback

The source determines who can do GetFeatureInfo

src/ol/renderer/layerrenderer.js

@@ -48,17 +48,21 @@ goog.inherits(ol.renderer.Layer, goog.Disposable);
  *     successful queries. The passed arguments are the resulting feature
  *     information and the layer.
  * @param {function()=} opt_error Callback for unsuccessful queries.
+ * @return {boolean} Whether getFeatureInfoForPixel was called on the source.
  */
 ol.renderer.Layer.prototype.getFeatureInfoForPixel =
     function(pixel, success, opt_error) {
   var layer = this.getLayer();
   var source = layer.getSource();
+  var haveGetFeatureInfo = false;
   if (goog.isFunction(source.getFeatureInfoForPixel)) {
     var callback = function(layerFeatureInfo) {
       success(layerFeatureInfo, layer);
     };
     source.getFeatureInfoForPixel(pixel, this.getMap(), callback, opt_error);
+    haveGetFeatureInfo = true;
   }
+  return haveGetFeatureInfo;
 };
 
 

src/ol/renderer/maprenderer.js

@@ -122,13 +122,11 @@ ol.renderer.Map.prototype.getFeatureInfoForPixel =
     }
   };
 
-  var layer, layerRenderer;
+  var layerRenderer;
   for (var i = 0; i < numLayers; ++i) {
-    layer = layers[i];
+    layerRenderer = this.getLayerRenderer(layers[i]);
-    layerRenderer = this.getLayerRenderer(layer);
+    if (layerRenderer.getFeatureInfoForPixel(pixel, callback, opt_error)) {
-    if (goog.isFunction(layerRenderer.getFeatureInfoForPixel)) {
       ++callbackCount;
-      layerRenderer.getFeatureInfoForPixel(pixel, callback, opt_error);
     }
   }
 };