From 7202573f829890b2f3b436af1d63216613f9e0b8 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Sun, 17 Dec 2017 17:52:32 +0100
Subject: [PATCH] Named export for ol/featureloader

---
 src/ol/VectorImageTile.js          |  6 ++----
 src/ol/featureloader.js            | 12 +++++-------
 src/ol/source/Vector.js            |  4 ++--
 test/spec/ol/featureloader.test.js |  8 ++++----
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/ol/VectorImageTile.js b/src/ol/VectorImageTile.js
index efe32da257..d6ad4abb4e 100644
--- a/src/ol/VectorImageTile.js
+++ b/src/ol/VectorImageTile.js
@@ -8,7 +8,7 @@ import {createCanvasContext2D} from './dom.js';
 import _ol_events_ from './events.js';
 import {getHeight, getIntersection, getWidth} from './extent.js';
 import EventType from './events/EventType.js';
-import _ol_featureloader_ from './featureloader.js';
+import {loadFeaturesXhr} from './featureloader.js';
 
 /**
  * @constructor
@@ -292,9 +292,7 @@ _ol_VectorImageTile_.prototype.finishLoading_ = function() {
  * @param {string} url URL.
  */
 _ol_VectorImageTile_.defaultLoadFunction = function(tile, url) {
-  var loader = _ol_featureloader_.loadFeaturesXhr(
-      url, tile.getFormat(), tile.onLoad.bind(tile), tile.onError.bind(tile));
-
+  var loader = loadFeaturesXhr(url, tile.getFormat(), tile.onLoad.bind(tile), tile.onError.bind(tile));
   tile.setLoader(loader);
 };
 export default _ol_VectorImageTile_;
diff --git a/src/ol/featureloader.js b/src/ol/featureloader.js
index 359e0c245a..714c8d056c 100644
--- a/src/ol/featureloader.js
+++ b/src/ol/featureloader.js
@@ -4,7 +4,6 @@
 import {nullFunction} from './index.js';
 import _ol_format_FormatType_ from './format/FormatType.js';
 import _ol_xml_ from './xml.js';
-var _ol_featureloader_ = {};
 
 
 /**
@@ -18,7 +17,7 @@ var _ol_featureloader_ = {};
  *     source as `this`.
  * @return {ol.FeatureLoader} The feature loader.
  */
-_ol_featureloader_.loadFeaturesXhr = function(url, format, success, failure) {
+export function loadFeaturesXhr(url, format, success, failure) {
   return (
     /**
      * @param {ol.Extent} extent Extent.
@@ -75,7 +74,7 @@ _ol_featureloader_.loadFeaturesXhr = function(url, format, success, failure) {
       xhr.send();
     }
   );
-};
+}
 
 
 /**
@@ -87,8 +86,8 @@ _ol_featureloader_.loadFeaturesXhr = function(url, format, success, failure) {
  * @return {ol.FeatureLoader} The feature loader.
  * @api
  */
-_ol_featureloader_.xhr = function(url, format) {
-  return _ol_featureloader_.loadFeaturesXhr(url, format,
+export function xhr(url, format) {
+  return loadFeaturesXhr(url, format,
       /**
        * @param {Array.<ol.Feature>} features The loaded features.
        * @param {ol.proj.Projection} dataProjection Data projection.
@@ -97,5 +96,4 @@ _ol_featureloader_.xhr = function(url, format) {
       function(features, dataProjection) {
         this.addFeatures(features);
       }, /* FIXME handle error */ nullFunction);
-};
-export default _ol_featureloader_;
+}
diff --git a/src/ol/source/Vector.js b/src/ol/source/Vector.js
index 6d330303af..e79cdd0edf 100644
--- a/src/ol/source/Vector.js
+++ b/src/ol/source/Vector.js
@@ -12,7 +12,7 @@ import _ol_events_ from '../events.js';
 import Event from '../events/Event.js';
 import EventType from '../events/EventType.js';
 import {containsExtent, equals} from '../extent.js';
-import _ol_featureloader_ from '../featureloader.js';
+import {xhr} from '../featureloader.js';
 import {TRUE} from '../functions.js';
 import _ol_loadingstrategy_ from '../loadingstrategy.js';
 import _ol_obj_ from '../obj.js';
@@ -73,7 +73,7 @@ var _ol_source_Vector_ = function(opt_options) {
   } else if (this.url_ !== undefined) {
     _ol_asserts_.assert(this.format_, 7); // `format` must be set when `url` is set
     // create a XHR feature loader for "url" and "format"
-    this.loader_ = _ol_featureloader_.xhr(this.url_, /** @type {ol.format.Feature} */ (this.format_));
+    this.loader_ = xhr(this.url_, /** @type {ol.format.Feature} */ (this.format_));
   }
 
   /**
diff --git a/test/spec/ol/featureloader.test.js b/test/spec/ol/featureloader.test.js
index 6165a735d6..6865ef1ef3 100644
--- a/test/spec/ol/featureloader.test.js
+++ b/test/spec/ol/featureloader.test.js
@@ -1,4 +1,4 @@
-import _ol_featureloader_ from '../../../src/ol/featureloader.js';
+import {xhr} from '../../../src/ol/featureloader.js';
 import GeoJSON from '../../../src/ol/format/GeoJSON.js';
 import _ol_source_Vector_ from '../../../src/ol/source/Vector.js';
 
@@ -19,7 +19,7 @@ describe('ol.featureloader', function() {
     });
 
     it('adds features to the source', function(done) {
-      loader = _ol_featureloader_.xhr(url, format);
+      loader = xhr(url, format);
       source.on('addfeature', function(e) {
         expect(source.getFeatures().length).to.be.greaterThan(0);
         done();
@@ -32,7 +32,7 @@ describe('ol.featureloader', function() {
         url = function(extent, resolution, projection) {
           return 'spec/ol/data/point.json';
         };
-        loader = _ol_featureloader_.xhr(url, format);
+        loader = xhr(url, format);
 
         source.on('addfeature', function(e) {
           expect(source.getFeatures().length).to.be.greaterThan(0);
@@ -52,7 +52,7 @@ describe('ol.featureloader', function() {
           done();
           return 'spec/ol/data/point.json';
         };
-        loader = _ol_featureloader_.xhr(url, format);
+        loader = xhr(url, format);
         loader.call(source, [], 1, 'EPSG:3857');
       });
     });