Named exports from loadingstrategy

examples/vector-esri-edit.js

@@ -7,7 +7,7 @@ import Modify from '../src/ol/interaction/Modify.js';
 import Select from '../src/ol/interaction/Select.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js';
+import {tile as tileStrategy} from '../src/ol/loadingstrategy.js';
 import {fromLonLat} from '../src/ol/proj.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import XYZ from '../src/ol/source/XYZ.js';
@@ -44,7 +44,7 @@ const vectorSource = new VectorSource({
       }
     }});
   },
-  strategy: _ol_loadingstrategy_.tile(_ol_tilegrid_.createXYZ({
+  strategy: tileStrategy(_ol_tilegrid_.createXYZ({
     tileSize: 512
   }))
 });

examples/vector-esri.js

@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import EsriJSON from '../src/ol/format/EsriJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js';
+import {tile as tileStrategy} from '../src/ol/loadingstrategy.js';
 import {fromLonLat} from '../src/ol/proj.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import XYZ from '../src/ol/source/XYZ.js';
@@ -82,7 +82,7 @@ const vectorSource = new VectorSource({
       }
     }});
   },
-  strategy: _ol_loadingstrategy_.tile(_ol_tilegrid_.createXYZ({
+  strategy: tileStrategy(_ol_tilegrid_.createXYZ({
     tileSize: 512
   }))
 });

examples/vector-osm.js

@@ -4,7 +4,7 @@ import {defaults as defaultControls} from '../src/ol/control.js';
 import OSMXML from '../src/ol/format/OSMXML.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js';
+import {bbox as bboxStrategy} from '../src/ol/loadingstrategy.js';
 import {transformExtent} from '../src/ol/proj.js';
 import BingMaps from '../src/ol/source/BingMaps.js';
 import VectorSource from '../src/ol/source/Vector.js';
@@ -95,7 +95,7 @@ const vectorSource = new VectorSource({
         ');rel(bn)->.foo;way(bn);node(w)->.foo;rel(bw););out meta;';
     client.send(query);
   },
-  strategy: _ol_loadingstrategy_.bbox
+  strategy: bboxStrategy
 });
 
 const vector = new VectorLayer({

examples/vector-wfs.js

@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
-import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js';
+import {bbox as bboxStrategy} from '../src/ol/loadingstrategy.js';
 import BingMaps from '../src/ol/source/BingMaps.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import Stroke from '../src/ol/style/Stroke.js';
@@ -18,7 +18,7 @@ const vectorSource = new VectorSource({
         'outputFormat=application/json&srsname=EPSG:3857&' +
         'bbox=' + extent.join(',') + ',EPSG:3857';
   },
-  strategy: _ol_loadingstrategy_.bbox
+  strategy: bboxStrategy
 });
 
 

src/ol/loadingstrategy.js

@@ -1,7 +1,6 @@
 /**
  * @module ol/loadingstrategy
  */
-const _ol_loadingstrategy_ = {};
 
 
 /**
@@ -11,7 +10,7 @@ const _ol_loadingstrategy_ = {};
  * @return {Array.<ol.Extent>} Extents.
  * @api
  */
-_ol_loadingstrategy_.all = function(extent, resolution) {
+export const all = function(extent, resolution) {
   return [[-Infinity, -Infinity, Infinity, Infinity]];
 };
 
@@ -24,7 +23,7 @@ _ol_loadingstrategy_.all = function(extent, resolution) {
  * @return {Array.<ol.Extent>} Extents.
  * @api
  */
-_ol_loadingstrategy_.bbox = function(extent, resolution) {
+export const bbox = function(extent, resolution) {
   return [extent];
 };
 
@@ -35,7 +34,7 @@ _ol_loadingstrategy_.bbox = function(extent, resolution) {
  * @return {function(ol.Extent, number): Array.<ol.Extent>} Loading strategy.
  * @api
  */
-_ol_loadingstrategy_.tile = function(tileGrid) {
+export const tile = function(tileGrid) {
   return (
     /**
      * @param {ol.Extent} extent Extent.
@@ -59,4 +58,3 @@ _ol_loadingstrategy_.tile = function(tileGrid) {
       return extents;
     });
 };
-export default _ol_loadingstrategy_;

src/ol/source/Vector.js

@@ -14,7 +14,7 @@ import EventType from '../events/EventType.js';
 import {containsExtent, equals} from '../extent.js';
 import {xhr} from '../featureloader.js';
 import {TRUE} from '../functions.js';
-import _ol_loadingstrategy_ from '../loadingstrategy.js';
+import {all as allStrategy} from '../loadingstrategy.js';
 import {isEmpty, getValues} from '../obj.js';
 import Source from '../source/Source.js';
 import SourceState from '../source/State.js';
@@ -80,8 +80,7 @@ const VectorSource = function(opt_options) {
    * @private
    * @type {ol.LoadingStrategy}
    */
-  this.strategy_ = options.strategy !== undefined ? options.strategy :
+  this.strategy_ = options.strategy !== undefined ? options.strategy : allStrategy;
-    _ol_loadingstrategy_.all;
 
   const useSpatialIndex =
       options.useSpatialIndex !== undefined ? options.useSpatialIndex : true;

test/spec/ol/source/vector.test.js

@@ -6,7 +6,7 @@ import View from '../../../../src/ol/View.js';
 import Point from '../../../../src/ol/geom/Point.js';
 import LineString from '../../../../src/ol/geom/LineString.js';
 import VectorLayer from '../../../../src/ol/layer/Vector.js';
-import _ol_loadingstrategy_ from '../../../../src/ol/loadingstrategy.js';
+import {bbox as bboxStrategy} from '../../../../src/ol/loadingstrategy.js';
 import {get as getProjection, transformExtent, fromLonLat} from '../../../../src/ol/proj.js';
 import VectorSource from '../../../../src/ol/source/Vector.js';
 
@@ -425,7 +425,7 @@ describe('ol.source.Vector', function() {
       it('requests the view extent plus render buffer', function(done) {
         const center = [-97.6114, 38.8403];
         const source = new VectorSource({
-          strategy: _ol_loadingstrategy_.bbox,
+          strategy: bboxStrategy,
           loader: function(extent) {
             setTimeout(function() {
               const lonLatExtent = transformExtent(extent, 'EPSG:3857', 'EPSG:4326');