Merge pull request #885 from ahocevar/wms-getfeatureinfo

Implement WMS GetFeatureInfo

src/ol/renderer/layerrenderer.js

@@ -73,6 +73,26 @@ ol.renderer.Layer = function(mapRenderer, layer) {
 goog.inherits(ol.renderer.Layer, goog.Disposable);
 
 
+/**
+ * @param {ol.Pixel} pixel Pixel coordinate relative to the map viewport.
+ * @param {function(string, ol.layer.Layer)} success Callback for
+ *     successful queries. The passed arguments are the resulting feature
+ *     information and the layer.
+ * @param {function()=} opt_error Callback for unsuccessful queries.
+ */
+ol.renderer.Layer.prototype.getFeatureInfoForPixel =
+    function(pixel, success, opt_error) {
+  var layer = this.getLayer();
+  var source = layer.getSource();
+  if (goog.isFunction(source.getFeatureInfoForPixel)) {
+    var callback = function(layerFeatureInfo) {
+      success(layerFeatureInfo, layer);
+    };
+    source.getFeatureInfoForPixel(pixel, this.getMap(), callback, opt_error);
+  }
+};
+
+
 /**
  * @protected
  * @return {ol.layer.Layer} Layer.

src/ol/renderer/maprenderer.js

@@ -106,7 +106,7 @@ ol.renderer.Map.prototype.getCanvas = goog.functions.NULL;
  *     information.  Layers that are able to provide attribute data will put
  *     ol.Feature instances, other layers will put a string which can either
  *     be plain text or markup.
- * @param {function(Object)=} opt_error Callback for unsuccessful
+ * @param {function()=} opt_error Callback for unsuccessful
  *     queries.
  */
 ol.renderer.Map.prototype.getFeatureInfoForPixel =
@@ -142,7 +142,7 @@ ol.renderer.Map.prototype.getFeatureInfoForPixel =
  *     information.  Layers that are able to provide attribute data will put
  *     ol.Feature instances, other layers will put a string which can either
  *     be plain text or markup.
- * @param {function(Object)=} opt_error Callback for unsuccessful
+ * @param {function()=} opt_error Callback for unsuccessful
  *     queries.
  */
 ol.renderer.Map.prototype.getFeaturesForPixel =