From 753ce9ca8ebe4b3c2bf5f646d9310b3d692d30ee Mon Sep 17 00:00:00 2001 From: Marc Jansen Date: Tue, 6 Feb 2018 06:51:38 +0100 Subject: [PATCH 1/2] Named exports from loadingstrategy --- examples/vector-esri-edit.js | 4 ++-- examples/vector-esri.js | 4 ++-- examples/vector-osm.js | 4 ++-- examples/vector-wfs.js | 4 ++-- src/ol/loadingstrategy.js | 18 ++++++++---------- src/ol/source/Vector.js | 5 ++--- test/spec/ol/source/vector.test.js | 4 ++-- 7 files changed, 20 insertions(+), 23 deletions(-) diff --git a/examples/vector-esri-edit.js b/examples/vector-esri-edit.js index d5660a5d82..6cd273d80d 100644 --- a/examples/vector-esri-edit.js +++ b/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 })) }); diff --git a/examples/vector-esri.js b/examples/vector-esri.js index e3c7bfdba6..451f93c4e3 100644 --- a/examples/vector-esri.js +++ b/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 })) }); diff --git a/examples/vector-osm.js b/examples/vector-osm.js index c4669f721f..db9980b4b1 100644 --- a/examples/vector-osm.js +++ b/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({ diff --git a/examples/vector-wfs.js b/examples/vector-wfs.js index 1dd7f5bbb4..7d233dd47b 100644 --- a/examples/vector-wfs.js +++ b/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 }); diff --git a/src/ol/loadingstrategy.js b/src/ol/loadingstrategy.js index cc31834dfe..79573cafc9 100644 --- a/src/ol/loadingstrategy.js +++ b/src/ol/loadingstrategy.js @@ -1,7 +1,6 @@ /** * @module ol/loadingstrategy */ -const _ol_loadingstrategy_ = {}; /** @@ -11,7 +10,7 @@ const _ol_loadingstrategy_ = {}; * @return {Array.} 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.} Extents. * @api */ -_ol_loadingstrategy_.bbox = function(extent, resolution) { +export const bbox = function(extent, resolution) { return [extent]; }; @@ -35,13 +34,13 @@ _ol_loadingstrategy_.bbox = function(extent, resolution) { * @return {function(ol.Extent, number): Array.} Loading strategy. * @api */ -_ol_loadingstrategy_.tile = function(tileGrid) { +export const tile = function(tileGrid) { return ( - /** - * @param {ol.Extent} extent Extent. - * @param {number} resolution Resolution. - * @return {Array.} Extents. - */ + /** + * @param {ol.Extent} extent Extent. + * @param {number} resolution Resolution. + * @return {Array.} Extents. + */ function(extent, resolution) { const z = tileGrid.getZForResolution(resolution); const tileRange = tileGrid.getTileRangeForExtentAndZ(extent, z); @@ -59,4 +58,3 @@ _ol_loadingstrategy_.tile = function(tileGrid) { return extents; }); }; -export default _ol_loadingstrategy_; diff --git a/src/ol/source/Vector.js b/src/ol/source/Vector.js index e6df7b422c..20f2f256c8 100644 --- a/src/ol/source/Vector.js +++ b/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 : - _ol_loadingstrategy_.all; + this.strategy_ = options.strategy !== undefined ? options.strategy : allStrategy; const useSpatialIndex = options.useSpatialIndex !== undefined ? options.useSpatialIndex : true; diff --git a/test/spec/ol/source/vector.test.js b/test/spec/ol/source/vector.test.js index a94b8c6525..1886ea6a56 100644 --- a/test/spec/ol/source/vector.test.js +++ b/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'); From 9fabdf309f98735769b4fc9429671b7461b25a96 Mon Sep 17 00:00:00 2001 From: Marc Jansen Date: Tue, 6 Feb 2018 17:26:49 +0100 Subject: [PATCH 2/2] Use function declaration for exports --- src/ol/loadingstrategy.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ol/loadingstrategy.js b/src/ol/loadingstrategy.js index 79573cafc9..9a799c3444 100644 --- a/src/ol/loadingstrategy.js +++ b/src/ol/loadingstrategy.js @@ -10,9 +10,9 @@ * @return {Array.} Extents. * @api */ -export const all = function(extent, resolution) { +export function all(extent, resolution) { return [[-Infinity, -Infinity, Infinity, Infinity]]; -}; +} /** @@ -23,9 +23,9 @@ export const all = function(extent, resolution) { * @return {Array.} Extents. * @api */ -export const bbox = function(extent, resolution) { +export function bbox(extent, resolution) { return [extent]; -}; +} /** @@ -34,7 +34,7 @@ export const bbox = function(extent, resolution) { * @return {function(ol.Extent, number): Array.} Loading strategy. * @api */ -export const tile = function(tileGrid) { +export function tile(tileGrid) { return ( /** * @param {ol.Extent} extent Extent. @@ -57,4 +57,4 @@ export const tile = function(tileGrid) { } return extents; }); -}; +}