The handleResponse method of WMSGetFeatureInfo now considers if the content-type

of the response is 'application/json'. In the case that JSON is returned, the
features array is constructed by parsing doc with OpenLayers.Format.GeoJSON.
This prevents a null reference issue when asking for feature information from
GeoServer on Internet Explorer 11.

Author: mdalbertsonjr

.gitignore

@@ -5,3 +5,4 @@
 /doc/apidocs/
 /examples/example-list.js
 /examples/example-list.xml
+*.swp

lib/OpenLayers/Control/WMSGetFeatureInfo.js

@@ -507,7 +507,16 @@ OpenLayers.Control.WMSGetFeatureInfo = OpenLayers.Class(OpenLayers.Control, {
         if(!doc || !doc.documentElement) {
             doc = request.responseText;
         }
-        var features = this.format.read(doc);
+
+        var features = [];
+        var responseHeaders = request.getAllResponseHeaders();
+        if(responseHeaders && this.infoFormat === "application/json" && responseHeaders.indexOf("application/json") !== -1) {
+            features = new OpenLayers.Format.GeoJSON().read(doc);
+        }
+        else {
+            features = this.format.read(doc);
+        }
+
         if (this.drillDown === false) {
             this.triggerGetFeatureInfo(request, xy, features);
         } else {
@@ -517,8 +526,9 @@ OpenLayers.Control.WMSGetFeatureInfo = OpenLayers.Class(OpenLayers.Control, {
                     {url: url, features: features}
                 );
             } else {
-            this._features = (this._features || []).concat(features);
+                this._features = (this._features || []).concat(features);
             }
+
             if (this._requestCount === this._numRequests) {
                 this.triggerGetFeatureInfo(request, xy, this._features.concat());
                 delete this._features;

tests/Control/WMSGetFeatureInfo.html

@@ -636,6 +636,47 @@
 
     }
 
+    function test_handleResponse_JSON(t) {
+        t.plan(5);
+
+        var clickCoordinate = {'xy': {'x': 50, 'y': 50}};
+        var request = {
+            'responseText': "{\"type\":\"FeatureCollection\",\"features\":[{\"type\":\"Feature\",\"id\":\"buildings.8359\",\"geometry\":{\"type\":\"MultiPolygon\",\"coordinates\":[[[[-1.3154005920528281E7,4044522.989129901],[-1.3154005851109248E7,4044516.519693766],[-1.3153997359215712E7,4044516.611228658],[-1.3153997376215957E7,4044518.0115422606],[-1.3153991465984887E7,4044518.073011226],[-1.315399104407448E7,4044477.984995398],[-1.3154005865324631E7,4044477.827667067],[-1.3154005904349212E7,4044481.415238877],[-1.3154007327546554E7,4044481.40174741],[-1.3154007326878684E7,4044480.991660189],[-1.315400926879267E7,4044480.9700426213],[-1.3154009229231585E7,4044476.979656877],[-1.3154014543494673E7,4044476.9229164813],[-1.3154014548324812E7,4044477.5916807987],[-1.3154018354806663E7,4044477.5484488346],[-1.3154018350072712E7,4044476.9388398607],[-1.3154023840985721E7,4044476.881804511],[-1.315402384562935E7,4044477.5098391017],[-1.315402758599418E7,4044477.4704705887],[-1.315402757752542E7,4044476.790681231],[-1.3154038257694557E7,4044476.6769741727],[-1.3154038262405435E7,4044477.3457386605],[-1.315404269041407E7,4044477.2978384267],[-1.315404286439716E7,4044493.7800058103],[-1.3154007524848279E7,4044494.155989673],[-1.3154007646710869E7,4044505.7094379417],[-1.3154022107703935E7,4044505.556316444],[-1.3154022094344625E7,4044504.170787319],[-1.3154018346731113E7,4044504.21016599],[-1.3154018290260306E7,4044498.878616157],[-1.315402591048427E7,4044498.795894118],[-1.315402596710939E7,4044504.145869147],[-1.3154023609634686E7,4044504.171931162],[-1.3154023626849018E7,4044505.7015852067],[-1.3154042883521369E7,4044505.4999371967],[-1.3154043053740704E7,4044521.893539395],[-1.3154034951699786E7,4044521.9808243145],[-1.3154034960102554E7,4044522.6938309614],[-1.3154027829018425E7,4044522.768359982],[-1.315402782070021E7,4044522.180937892],[-1.3154024176006297E7,4044522.220149225],[-1.3154024180475479E7,4044522.74114868],[-1.3154018700641066E7,4044522.798166171],[-1.3154018696220534E7,4044522.30686572],[-1.3154014871261876E7,4044522.350007108],[-1.3154014875893366E7,4044522.8968263282],[-1.3154005920528281E7,4044522.989129901]]]]},\"geometry_name\":\"the_geom\",\"properties\":{\"CODE\":\"Building\",\"BLD_ID\":\"511910864932\",\"HEIGHT\":26.76,\"ELEV\":677.3,\"AREA\":0,\"SOURCE\":\"LARIAC2\",\"DATE_\":\"2008\",\"AIN\":\"5313004018\",\"Shape_Leng\":830.711543857,\"Shape_Area\":13794.2724736}}],\"crs\":{\"type\":\"EPSG\",\"properties\":{\"code\":\"3857\"}}}",
+            'getAllResponseHeaders': function() {
+               return "application/json";
+            }
+        };
+        var url = "http://localhost/wms";
+
+        var map = new OpenLayers.Map("map", {
+            getExtent: function() {return(new OpenLayers.Bounds(-180,-90,180,90));}
+            }
+        );
+
+        var a = new OpenLayers.Layer.WMS(null, url, {
+            layers: "a",
+            version: "1.3.0"
+        });
+        map.addLayer(a);
+
+        var click = new OpenLayers.Control.WMSGetFeatureInfo({
+        });
+        click.infoFormat = "application/json";
+        click.events.register('getfeatureinfo', click, function(evt) {
+            t.ok(evt, "Event object exists");
+            t.ok(evt.text, "Event text exists");
+            t.ok(evt.features, "Event features exists");
+            t.ok(evt.xy, "Event coordinate exists");
+
+            t.eq(evt.features.length, 1, "Should contain one element");
+        });
+
+        map.addControl(click);
+        click.activate();
+
+        click.handleResponse(clickCoordinate, request, url);
+    }
+
     </script>
 </head>
 <body>