Merge pull request #882 from jgravois/patch876

don't ask utility.arcgis.com services for geojson

spec/Tasks/QuerySpec.js

@@ -775,5 +775,21 @@ describe('L.esri.Query', function () {
 
     server.respond();
   });
+
+  it('should not ask for GeoJSON from utility.arcgis.com', function (done) {
+    task = L.esri.query({url: 'http://utility.arcgis.com/mock/arcgis/rest/services/MockFeatureService/FeatureServer/0/'});
+
+    server.respondWith('GET', 'http://utility.arcgis.com/mock/arcgis/rest/services/MockFeatureService/FeatureServer/0/query?returnGeometry=true&where=1%3D1&outSr=4326&outFields=*&f=json', JSON.stringify(sampleMapServiceQueryResponse));
+
+    var request = task.run(function (error, featureCollection, raw) {
+      expect(featureCollection).to.deep.equal(sampleMapServiceCollection);
+      expect(raw).to.deep.equal(sampleMapServiceQueryResponse);
+      done();
+    });
+
+    expect(request).to.be.an.instanceof(XMLHttpRequest);
+
+    server.respond();
+  });
 });
 /* eslint-enable handle-callback-err*/

src/Util.js

@@ -104,8 +104,9 @@ export function cleanUrl (url) {
 }
 
 export function isArcgisOnline (url) {
-  /* hosted feature services can emit geojson natively. */
-  return (/\.arcgis\.com.*?FeatureServer/g).test(url);
+  /* hosted feature services support geojson as an output format
+  utility.arcgis.com services are proxied from a variety of ArcGIS Server vintages, and may not */
+  return (/^(?!.*utility\.arcgis\.com).*\.arcgis\.com.*FeatureServer/i).test(url);
 }
 
 export function geojsonTypeToArcGIS (geoJsonType) {