Make code prettier
This updates ESLint and our shared eslint-config-openlayers to use Prettier. Most formatting changes were automatically applied with this:
npm run lint -- --fix
A few manual changes were required:
* In `examples/offscreen-canvas.js`, the `//eslint-disable-line` comment needed to be moved to the appropriate line to disable the error about the `'worker-loader!./offscreen-canvas.worker.js'` import.
* In `examples/webpack/exapmle-builder.js`, spaces could not be added after a couple `function`s for some reason. While editing this, I reworked `ExampleBuilder` to be a class.
* In `src/ol/format/WMSGetFeatureInfo.js`, the `// @ts-ignore` comment needed to be moved down one line so it applied to the `parsersNS` argument.
This commit is contained in:
Tim Schaub
@@ -1,65 +1,59 @@
|
||||
import {listen} from '../../../../src/ol/events.js';
|
||||
import Collection from '../../../../src/ol/Collection.js';
|
||||
import Feature from '../../../../src/ol/Feature.js';
|
||||
import Map from '../../../../src/ol/Map.js';
|
||||
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 {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';
|
||||
import GeoJSON from '../../../../src/ol/format/GeoJSON.js';
|
||||
import LineString from '../../../../src/ol/geom/LineString.js';
|
||||
import Map from '../../../../src/ol/Map.js';
|
||||
import Point from '../../../../src/ol/geom/Point.js';
|
||||
import VectorLayer from '../../../../src/ol/layer/Vector.js';
|
||||
import VectorSource from '../../../../src/ol/source/Vector.js';
|
||||
import View from '../../../../src/ol/View.js';
|
||||
import {bbox as bboxStrategy} from '../../../../src/ol/loadingstrategy.js';
|
||||
import {
|
||||
fromLonLat,
|
||||
get as getProjection,
|
||||
transformExtent,
|
||||
} from '../../../../src/ol/proj.js';
|
||||
import {getUid} from '../../../../src/ol/util.js';
|
||||
import {listen} from '../../../../src/ol/events.js';
|
||||
|
||||
|
||||
describe('ol.source.Vector', function() {
|
||||
|
||||
describe('ol.source.Vector', function () {
|
||||
let pointFeature;
|
||||
let infiniteExtent;
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
pointFeature = new Feature(new Point([0, 0]));
|
||||
infiniteExtent = [-Infinity, -Infinity, Infinity, Infinity];
|
||||
});
|
||||
|
||||
describe('when empty', function() {
|
||||
|
||||
describe('when empty', function () {
|
||||
let vectorSource;
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
vectorSource = new VectorSource();
|
||||
});
|
||||
|
||||
describe('#forEachFeatureInExtent', function() {
|
||||
|
||||
it('does not call the callback', function() {
|
||||
describe('#forEachFeatureInExtent', function () {
|
||||
it('does not call the callback', function () {
|
||||
const f = sinon.spy();
|
||||
vectorSource.forEachFeatureInExtent(infiniteExtent, f);
|
||||
expect(f.called).to.be(false);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#getFeaturesInExtent', function() {
|
||||
|
||||
it('returns an empty array', function() {
|
||||
describe('#getFeaturesInExtent', function () {
|
||||
it('returns an empty array', function () {
|
||||
const features = vectorSource.getFeaturesInExtent(infiniteExtent);
|
||||
expect(features).to.be.an(Array);
|
||||
expect(features).to.be.empty();
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#isEmpty', function() {
|
||||
|
||||
it('returns true', function() {
|
||||
describe('#isEmpty', function () {
|
||||
it('returns true', function () {
|
||||
expect(vectorSource.isEmpty()).to.be(true);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#addFeature', function() {
|
||||
|
||||
it('can add a single point feature', function() {
|
||||
describe('#addFeature', function () {
|
||||
it('can add a single point feature', function () {
|
||||
vectorSource.addFeature(pointFeature);
|
||||
const features = vectorSource.getFeaturesInExtent(infiniteExtent);
|
||||
expect(features).to.be.an(Array);
|
||||
@@ -67,14 +61,14 @@ describe('ol.source.Vector', function() {
|
||||
expect(features[0]).to.be(pointFeature);
|
||||
});
|
||||
|
||||
it('fires a change event', function() {
|
||||
it('fires a change event', function () {
|
||||
const listener = sinon.spy();
|
||||
listen(vectorSource, 'change', listener);
|
||||
vectorSource.addFeature(pointFeature);
|
||||
expect(listener.called).to.be(true);
|
||||
});
|
||||
|
||||
it('adds same id features only once', function() {
|
||||
it('adds same id features only once', function () {
|
||||
const source = new VectorSource();
|
||||
const feature1 = new Feature();
|
||||
feature1.setId('1');
|
||||
@@ -84,78 +78,79 @@ describe('ol.source.Vector', function() {
|
||||
source.addFeature(feature2);
|
||||
expect(source.getFeatures().length).to.be(1);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#hasFeature', function() {
|
||||
|
||||
it('returns true for added feature without id', function() {
|
||||
describe('#hasFeature', function () {
|
||||
it('returns true for added feature without id', function () {
|
||||
const feature = new Feature();
|
||||
vectorSource.addFeature(feature);
|
||||
expect(vectorSource.hasFeature(feature)).to.be(true);
|
||||
});
|
||||
|
||||
it('returns true for added feature with id', function() {
|
||||
it('returns true for added feature with id', function () {
|
||||
const feature = new Feature();
|
||||
feature.setId('1');
|
||||
vectorSource.addFeature(feature);
|
||||
expect(vectorSource.hasFeature(feature)).to.be(true);
|
||||
});
|
||||
|
||||
it('return false for removed feature', function() {
|
||||
it('return false for removed feature', function () {
|
||||
const feature = new Feature();
|
||||
vectorSource.addFeature(feature);
|
||||
vectorSource.removeFeature(feature);
|
||||
expect(vectorSource.hasFeature(feature)).to.be(false);
|
||||
});
|
||||
|
||||
it('returns false for non-added feature', function() {
|
||||
it('returns false for non-added feature', function () {
|
||||
const feature = new Feature();
|
||||
expect(vectorSource.hasFeature(feature)).to.be(false);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('when populated with 3 features', function() {
|
||||
|
||||
describe('when populated with 3 features', function () {
|
||||
const features = [];
|
||||
let vectorSource;
|
||||
beforeEach(function() {
|
||||
features.push(new Feature(new LineString([[0, 0], [10, 10]])));
|
||||
beforeEach(function () {
|
||||
features.push(
|
||||
new Feature(
|
||||
new LineString([
|
||||
[0, 0],
|
||||
[10, 10],
|
||||
])
|
||||
)
|
||||
);
|
||||
features.push(new Feature(new Point([0, 10])));
|
||||
features.push(new Feature(new Point([10, 5])));
|
||||
vectorSource = new VectorSource({
|
||||
features: features
|
||||
features: features,
|
||||
});
|
||||
});
|
||||
|
||||
describe('#getClosestFeatureToCoordinate', function() {
|
||||
|
||||
it('returns the expected feature', function() {
|
||||
describe('#getClosestFeatureToCoordinate', function () {
|
||||
it('returns the expected feature', function () {
|
||||
const feature = vectorSource.getClosestFeatureToCoordinate([1, 9]);
|
||||
expect(feature).to.be(features[1]);
|
||||
});
|
||||
|
||||
it('returns the expected feature when a filter is used', function() {
|
||||
const feature = vectorSource.getClosestFeatureToCoordinate([1, 9], function(feature) {
|
||||
return feature.getGeometry().getType() == 'LineString';
|
||||
});
|
||||
it('returns the expected feature when a filter is used', function () {
|
||||
const feature = vectorSource.getClosestFeatureToCoordinate(
|
||||
[1, 9],
|
||||
function (feature) {
|
||||
return feature.getGeometry().getType() == 'LineString';
|
||||
}
|
||||
);
|
||||
expect(feature).to.be(features[0]);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('clear and refresh', function() {
|
||||
|
||||
describe('clear and refresh', function () {
|
||||
let map, source, spy;
|
||||
beforeEach(function(done) {
|
||||
beforeEach(function (done) {
|
||||
source = new VectorSource({
|
||||
format: new GeoJSON(),
|
||||
url: 'spec/ol/source/vectorsource/single-feature.json'
|
||||
url: 'spec/ol/source/vectorsource/single-feature.json',
|
||||
});
|
||||
const target = document.createElement('div');
|
||||
target.style.width = '100px';
|
||||
@@ -165,21 +160,21 @@ describe('ol.source.Vector', function() {
|
||||
target: target,
|
||||
layers: [
|
||||
new VectorLayer({
|
||||
source: source
|
||||
})
|
||||
source: source,
|
||||
}),
|
||||
],
|
||||
view: new View({
|
||||
center: [0, 0],
|
||||
zoom: 0
|
||||
})
|
||||
zoom: 0,
|
||||
}),
|
||||
});
|
||||
map.once('rendercomplete', function() {
|
||||
map.once('rendercomplete', function () {
|
||||
spy = sinon.spy(source, 'loader_');
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
afterEach(function () {
|
||||
if (spy) {
|
||||
source.loader_.restore();
|
||||
}
|
||||
@@ -187,9 +182,9 @@ describe('ol.source.Vector', function() {
|
||||
map.setTarget(null);
|
||||
});
|
||||
|
||||
it('#refresh() reloads from server', function(done) {
|
||||
it('#refresh() reloads from server', function (done) {
|
||||
expect(source.getFeatures()).to.have.length(1);
|
||||
map.once('rendercomplete', function() {
|
||||
map.once('rendercomplete', function () {
|
||||
expect(source.getFeatures()).to.have.length(1);
|
||||
expect(spy.callCount).to.be(1);
|
||||
done();
|
||||
@@ -197,9 +192,9 @@ describe('ol.source.Vector', function() {
|
||||
source.refresh();
|
||||
});
|
||||
|
||||
it('#clear() removes all features from the source', function(done) {
|
||||
it('#clear() removes all features from the source', function (done) {
|
||||
expect(source.getFeatures()).to.have.length(1);
|
||||
map.once('rendercomplete', function() {
|
||||
map.once('rendercomplete', function () {
|
||||
expect(source.getFeatures()).to.have.length(0);
|
||||
expect(spy.callCount).to.be(0);
|
||||
done();
|
||||
@@ -207,14 +202,20 @@ describe('ol.source.Vector', function() {
|
||||
source.clear();
|
||||
});
|
||||
|
||||
it('After #setUrl(), refresh() loads from the new url', function(done) {
|
||||
it('After #setUrl(), refresh() loads from the new url', function (done) {
|
||||
source.loader_.restore();
|
||||
spy = undefined;
|
||||
expect(source.getFeatures()).to.have.length(1);
|
||||
const oldCoordinates = source.getFeatures()[0].getGeometry().getCoordinates();
|
||||
map.on('rendercomplete', function() {
|
||||
const oldCoordinates = source
|
||||
.getFeatures()[0]
|
||||
.getGeometry()
|
||||
.getCoordinates();
|
||||
map.on('rendercomplete', function () {
|
||||
expect(source.getFeatures()).to.have.length(1);
|
||||
const newCoordinates = source.getFeatures()[0].getGeometry().getCoordinates();
|
||||
const newCoordinates = source
|
||||
.getFeatures()[0]
|
||||
.getGeometry()
|
||||
.getCoordinates();
|
||||
expect(newCoordinates).to.not.eql(oldCoordinates);
|
||||
done();
|
||||
});
|
||||
@@ -223,26 +224,23 @@ describe('ol.source.Vector', function() {
|
||||
});
|
||||
});
|
||||
|
||||
describe('when populated with 10 random points and a null', function() {
|
||||
|
||||
describe('when populated with 10 random points and a null', function () {
|
||||
let features;
|
||||
let vectorSource;
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
features = [];
|
||||
let i;
|
||||
for (i = 0; i < 10; ++i) {
|
||||
features[i] =
|
||||
new Feature(new Point([Math.random(), Math.random()]));
|
||||
features[i] = new Feature(new Point([Math.random(), Math.random()]));
|
||||
}
|
||||
features.push(new Feature(null));
|
||||
vectorSource = new VectorSource({
|
||||
features: features
|
||||
features: features,
|
||||
});
|
||||
});
|
||||
|
||||
describe('#clear', function() {
|
||||
|
||||
it('removes all features using fast path', function() {
|
||||
describe('#clear', function () {
|
||||
it('removes all features using fast path', function () {
|
||||
const removeFeatureSpy = sinon.spy();
|
||||
listen(vectorSource, 'removefeature', removeFeatureSpy);
|
||||
const clearSourceSpy = sinon.spy();
|
||||
@@ -256,7 +254,7 @@ describe('ol.source.Vector', function() {
|
||||
expect(clearSourceSpy.callCount).to.be(1);
|
||||
});
|
||||
|
||||
it('removes all features using slow path', function() {
|
||||
it('removes all features using slow path', function () {
|
||||
const removeFeatureSpy = sinon.spy();
|
||||
listen(vectorSource, 'removefeature', removeFeatureSpy);
|
||||
const clearSourceSpy = sinon.spy();
|
||||
@@ -269,149 +267,138 @@ describe('ol.source.Vector', function() {
|
||||
expect(clearSourceSpy.called).to.be(true);
|
||||
expect(clearSourceSpy.callCount).to.be(1);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#forEachFeatureInExtent', function() {
|
||||
|
||||
it('is called the expected number of times', function() {
|
||||
describe('#forEachFeatureInExtent', function () {
|
||||
it('is called the expected number of times', function () {
|
||||
const f = sinon.spy();
|
||||
vectorSource.forEachFeatureInExtent(infiniteExtent, f);
|
||||
expect(f.callCount).to.be(10);
|
||||
});
|
||||
|
||||
it('allows breaking out', function() {
|
||||
it('allows breaking out', function () {
|
||||
let count = 0;
|
||||
const result = vectorSource.forEachFeatureInExtent(infiniteExtent,
|
||||
function(f) {
|
||||
const result = vectorSource.forEachFeatureInExtent(
|
||||
infiniteExtent,
|
||||
function (f) {
|
||||
return ++count == 5;
|
||||
});
|
||||
}
|
||||
);
|
||||
expect(result).to.be(true);
|
||||
expect(count).to.be(5);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#getFeaturesInExtent', function() {
|
||||
|
||||
it('returns the expected number of features', function() {
|
||||
expect(vectorSource.getFeaturesInExtent(infiniteExtent)).
|
||||
to.have.length(10);
|
||||
describe('#getFeaturesInExtent', function () {
|
||||
it('returns the expected number of features', function () {
|
||||
expect(vectorSource.getFeaturesInExtent(infiniteExtent)).to.have.length(
|
||||
10
|
||||
);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#isEmpty', function() {
|
||||
|
||||
it('returns false', function() {
|
||||
describe('#isEmpty', function () {
|
||||
it('returns false', function () {
|
||||
expect(vectorSource.isEmpty()).to.be(false);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#removeFeature', function() {
|
||||
|
||||
it('works as expected', function() {
|
||||
describe('#removeFeature', function () {
|
||||
it('works as expected', function () {
|
||||
let i;
|
||||
for (i = features.length - 1; i >= 0; --i) {
|
||||
vectorSource.removeFeature(features[i]);
|
||||
expect(vectorSource.getFeaturesInExtent(infiniteExtent)).
|
||||
have.length(i);
|
||||
expect(vectorSource.getFeaturesInExtent(infiniteExtent)).have.length(
|
||||
i
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
it('fires a change event', function() {
|
||||
it('fires a change event', function () {
|
||||
const listener = sinon.spy();
|
||||
listen(vectorSource, 'change', listener);
|
||||
vectorSource.removeFeature(features[0]);
|
||||
expect(listener.called).to.be(true);
|
||||
});
|
||||
|
||||
it('fires a removefeature event', function() {
|
||||
it('fires a removefeature event', function () {
|
||||
const listener = sinon.spy();
|
||||
listen(vectorSource, 'removefeature', listener);
|
||||
vectorSource.removeFeature(features[0]);
|
||||
expect(listener.called).to.be(true);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('modifying a feature\'s geometry', function() {
|
||||
|
||||
it('keeps the R-Tree index up to date', function() {
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 1, 1])).
|
||||
to.have.length(10);
|
||||
describe("modifying a feature's geometry", function () {
|
||||
it('keeps the R-Tree index up to date', function () {
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 1, 1])).to.have.length(
|
||||
10
|
||||
);
|
||||
features[0].getGeometry().setCoordinates([100, 100]);
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 1, 1])).
|
||||
to.have.length(9);
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 1, 1])).to.have.length(
|
||||
9
|
||||
);
|
||||
features[0].getGeometry().setCoordinates([0.5, 0.5]);
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 1, 1])).
|
||||
to.have.length(10);
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 1, 1])).to.have.length(
|
||||
10
|
||||
);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('setting a features geometry', function() {
|
||||
|
||||
it('keeps the R-Tree index up to date', function() {
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 1, 1])).
|
||||
to.have.length(10);
|
||||
describe('setting a features geometry', function () {
|
||||
it('keeps the R-Tree index up to date', function () {
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 1, 1])).to.have.length(
|
||||
10
|
||||
);
|
||||
features[0].setGeometry(new Point([100, 100]));
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 1, 1])).
|
||||
to.have.length(9);
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 1, 1])).to.have.length(
|
||||
9
|
||||
);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('tracking changes to features', function() {
|
||||
|
||||
describe('tracking changes to features', function () {
|
||||
let vectorSource;
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
vectorSource = new VectorSource();
|
||||
});
|
||||
|
||||
it('keeps its index up-to-date', function() {
|
||||
it('keeps its index up-to-date', function () {
|
||||
const feature = new Feature(new Point([1, 1]));
|
||||
vectorSource.addFeature(feature);
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 2, 2])).
|
||||
to.eql([feature]);
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 2, 2])).to.eql([feature]);
|
||||
feature.getGeometry().setCoordinates([3, 3]);
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 2, 2])).
|
||||
to.be.empty();
|
||||
expect(vectorSource.getFeaturesInExtent([2, 2, 4, 4])).
|
||||
to.eql([feature]);
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 2, 2])).to.be.empty();
|
||||
expect(vectorSource.getFeaturesInExtent([2, 2, 4, 4])).to.eql([feature]);
|
||||
});
|
||||
|
||||
it('handles features with null geometries', function() {
|
||||
it('handles features with null geometries', function () {
|
||||
const feature = new Feature(null);
|
||||
vectorSource.addFeature(feature);
|
||||
expect(vectorSource.getFeatures()).to.eql([feature]);
|
||||
});
|
||||
|
||||
it('handles features with geometries changing from null', function() {
|
||||
it('handles features with geometries changing from null', function () {
|
||||
const feature = new Feature(null);
|
||||
vectorSource.addFeature(feature);
|
||||
expect(vectorSource.getFeatures()).to.eql([feature]);
|
||||
feature.setGeometry(new Point([1, 1]));
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 2, 2])).
|
||||
to.eql([feature]);
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 2, 2])).to.eql([feature]);
|
||||
expect(vectorSource.getFeatures()).to.eql([feature]);
|
||||
});
|
||||
|
||||
it('handles features with geometries changing to null', function() {
|
||||
it('handles features with geometries changing to null', function () {
|
||||
const feature = new Feature(new Point([1, 1]));
|
||||
vectorSource.addFeature(feature);
|
||||
expect(vectorSource.getFeatures()).to.eql([feature]);
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 2, 2])).
|
||||
to.eql([feature]);
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 2, 2])).to.eql([feature]);
|
||||
feature.setGeometry(null);
|
||||
expect(vectorSource.getFeaturesInExtent([0, 0, 2, 2])).to.be.empty();
|
||||
expect(vectorSource.getFeatures()).to.eql([feature]);
|
||||
});
|
||||
|
||||
it('fires a change event when setting a feature\'s property', function() {
|
||||
it("fires a change event when setting a feature's property", function () {
|
||||
const feature = new Feature(new Point([1, 1]));
|
||||
vectorSource.addFeature(feature);
|
||||
const listener = sinon.spy();
|
||||
@@ -420,33 +407,32 @@ describe('ol.source.Vector', function() {
|
||||
expect(listener.called).to.be(true);
|
||||
});
|
||||
|
||||
it('fires a changefeature event when updating a feature', function() {
|
||||
it('fires a changefeature event when updating a feature', function () {
|
||||
const feature = new Feature(new Point([1, 1]));
|
||||
vectorSource.addFeature(feature);
|
||||
const listener = sinon.spy(function(event) {
|
||||
const listener = sinon.spy(function (event) {
|
||||
expect(event.feature).to.be(feature);
|
||||
});
|
||||
vectorSource.on('changefeature', listener);
|
||||
feature.setStyle(null);
|
||||
expect(listener.called).to.be(true);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#getFeatureById()', function() {
|
||||
describe('#getFeatureById()', function () {
|
||||
let source;
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
source = new VectorSource();
|
||||
});
|
||||
|
||||
it('returns a feature by id', function() {
|
||||
it('returns a feature by id', function () {
|
||||
const feature = new Feature();
|
||||
feature.setId('foo');
|
||||
source.addFeature(feature);
|
||||
expect(source.getFeatureById('foo')).to.be(feature);
|
||||
});
|
||||
|
||||
it('returns a feature by id (set after add)', function() {
|
||||
it('returns a feature by id (set after add)', function () {
|
||||
const feature = new Feature();
|
||||
source.addFeature(feature);
|
||||
expect(source.getFeatureById('foo')).to.be(null);
|
||||
@@ -454,14 +440,14 @@ describe('ol.source.Vector', function() {
|
||||
expect(source.getFeatureById('foo')).to.be(feature);
|
||||
});
|
||||
|
||||
it('returns null when no feature is found', function() {
|
||||
it('returns null when no feature is found', function () {
|
||||
const feature = new Feature();
|
||||
feature.setId('foo');
|
||||
source.addFeature(feature);
|
||||
expect(source.getFeatureById('bar')).to.be(null);
|
||||
});
|
||||
|
||||
it('returns null after removing feature', function() {
|
||||
it('returns null after removing feature', function () {
|
||||
const feature = new Feature();
|
||||
feature.setId('foo');
|
||||
source.addFeature(feature);
|
||||
@@ -470,7 +456,7 @@ describe('ol.source.Vector', function() {
|
||||
expect(source.getFeatureById('foo')).to.be(null);
|
||||
});
|
||||
|
||||
it('returns null after unsetting id', function() {
|
||||
it('returns null after unsetting id', function () {
|
||||
const feature = new Feature();
|
||||
feature.setId('foo');
|
||||
source.addFeature(feature);
|
||||
@@ -479,7 +465,7 @@ describe('ol.source.Vector', function() {
|
||||
expect(source.getFeatureById('foo')).to.be(null);
|
||||
});
|
||||
|
||||
it('returns null after clear', function() {
|
||||
it('returns null after clear', function () {
|
||||
const feature = new Feature();
|
||||
feature.setId('foo');
|
||||
source.addFeature(feature);
|
||||
@@ -488,13 +474,13 @@ describe('ol.source.Vector', function() {
|
||||
expect(source.getFeatureById('foo')).to.be(null);
|
||||
});
|
||||
|
||||
it('returns null when no features are indexed', function() {
|
||||
it('returns null when no features are indexed', function () {
|
||||
expect(source.getFeatureById('foo')).to.be(null);
|
||||
source.addFeature(new Feature());
|
||||
expect(source.getFeatureById('foo')).to.be(null);
|
||||
});
|
||||
|
||||
it('returns correct feature after add/remove/add', function() {
|
||||
it('returns correct feature after add/remove/add', function () {
|
||||
expect(source.getFeatureById('foo')).to.be(null);
|
||||
const first = new Feature();
|
||||
first.setId('foo');
|
||||
@@ -508,7 +494,7 @@ describe('ol.source.Vector', function() {
|
||||
expect(source.getFeatureById('foo')).to.be(second);
|
||||
});
|
||||
|
||||
it('returns correct feature after add/change', function() {
|
||||
it('returns correct feature after add/change', function () {
|
||||
expect(source.getFeatureById('foo')).to.be(null);
|
||||
const feature = new Feature();
|
||||
feature.setId('foo');
|
||||
@@ -518,29 +504,28 @@ describe('ol.source.Vector', function() {
|
||||
expect(source.getFeatureById('foo')).to.be(null);
|
||||
expect(source.getFeatureById('bar')).to.be(feature);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#getFeatureByUid()', function() {
|
||||
describe('#getFeatureByUid()', function () {
|
||||
let source;
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
source = new VectorSource();
|
||||
});
|
||||
|
||||
it('returns a feature with an id', function() {
|
||||
it('returns a feature with an id', function () {
|
||||
const feature = new Feature();
|
||||
feature.setId('abcd');
|
||||
source.addFeature(feature);
|
||||
expect(source.getFeatureByUid(getUid(feature))).to.be(feature);
|
||||
});
|
||||
|
||||
it('returns a feature without id', function() {
|
||||
it('returns a feature without id', function () {
|
||||
const feature = new Feature();
|
||||
source.addFeature(feature);
|
||||
expect(source.getFeatureByUid(getUid(feature))).to.be(feature);
|
||||
});
|
||||
|
||||
it('returns null when no feature is found', function() {
|
||||
it('returns null when no feature is found', function () {
|
||||
const feature = new Feature();
|
||||
feature.setId('abcd');
|
||||
source.addFeature(feature);
|
||||
@@ -548,7 +533,7 @@ describe('ol.source.Vector', function() {
|
||||
expect(source.getFeatureByUid(wrongId)).to.be(null);
|
||||
});
|
||||
|
||||
it('returns null after removing feature', function() {
|
||||
it('returns null after removing feature', function () {
|
||||
const feature = new Feature();
|
||||
feature.setId('abcd');
|
||||
source.addFeature(feature);
|
||||
@@ -558,7 +543,7 @@ describe('ol.source.Vector', function() {
|
||||
expect(source.getFeatureByUid(uid)).to.be(null);
|
||||
});
|
||||
|
||||
it('returns null after clear', function() {
|
||||
it('returns null after clear', function () {
|
||||
const feature = new Feature();
|
||||
feature.setId('abcd');
|
||||
source.addFeature(feature);
|
||||
@@ -568,29 +553,29 @@ describe('ol.source.Vector', function() {
|
||||
expect(source.getFeatureByUid(uid)).to.be(null);
|
||||
});
|
||||
|
||||
it('returns null when no features are present', function() {
|
||||
it('returns null when no features are present', function () {
|
||||
expect(source.getFeatureByUid('abcd')).to.be(null);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#loadFeatures', function() {
|
||||
|
||||
describe('with the "bbox" strategy', function() {
|
||||
|
||||
|
||||
it('requests the view extent plus render buffer', function(done) {
|
||||
describe('#loadFeatures', function () {
|
||||
describe('with the "bbox" strategy', function () {
|
||||
it('requests the view extent plus render buffer', function (done) {
|
||||
const center = [-97.6114, 38.8403];
|
||||
const source = new VectorSource({
|
||||
strategy: bboxStrategy,
|
||||
loader: function(extent) {
|
||||
setTimeout(function() {
|
||||
const lonLatExtent = transformExtent(extent, 'EPSG:3857', 'EPSG:4326');
|
||||
loader: function (extent) {
|
||||
setTimeout(function () {
|
||||
const lonLatExtent = transformExtent(
|
||||
extent,
|
||||
'EPSG:3857',
|
||||
'EPSG:4326'
|
||||
);
|
||||
expect(lonLatExtent[0]).to.roughlyEqual(-99.259349218, 1e-9);
|
||||
expect(lonLatExtent[2]).to.roughlyEqual(-95.963450781, 1e-9);
|
||||
done();
|
||||
}, 0);
|
||||
}
|
||||
},
|
||||
});
|
||||
const div = document.createElement('div');
|
||||
div.style.width = '100px';
|
||||
@@ -600,79 +585,92 @@ describe('ol.source.Vector', function() {
|
||||
target: div,
|
||||
layers: [
|
||||
new VectorLayer({
|
||||
source: source
|
||||
})
|
||||
source: source,
|
||||
}),
|
||||
],
|
||||
view: new View({
|
||||
center: fromLonLat(center),
|
||||
zoom: 7
|
||||
})
|
||||
zoom: 7,
|
||||
}),
|
||||
});
|
||||
map.renderSync();
|
||||
map.setTarget(null);
|
||||
document.body.removeChild(div);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('with no loader and the "all" strategy', function() {
|
||||
|
||||
it('stores the infinity extent in the Rtree', function() {
|
||||
describe('with no loader and the "all" strategy', function () {
|
||||
it('stores the infinity extent in the Rtree', function () {
|
||||
const source = new VectorSource();
|
||||
source.loadFeatures([-10000, -10000, 10000, 10000], 1,
|
||||
getProjection('EPSG:3857'));
|
||||
source.loadFeatures(
|
||||
[-10000, -10000, 10000, 10000],
|
||||
1,
|
||||
getProjection('EPSG:3857')
|
||||
);
|
||||
const loadedExtents = source.loadedExtentsRtree_.getAll();
|
||||
expect(loadedExtents).to.have.length(1);
|
||||
expect(loadedExtents[0].extent).to.eql(
|
||||
[-Infinity, -Infinity, Infinity, Infinity]);
|
||||
expect(loadedExtents[0].extent).to.eql([
|
||||
-Infinity,
|
||||
-Infinity,
|
||||
Infinity,
|
||||
Infinity,
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('with setLoader', function() {
|
||||
|
||||
it('it will change the loader function', function() {
|
||||
describe('with setLoader', function () {
|
||||
it('it will change the loader function', function () {
|
||||
let count1 = 0;
|
||||
const loader1 = function(bbox, resolution, projection) {
|
||||
const loader1 = function (bbox, resolution, projection) {
|
||||
count1++;
|
||||
};
|
||||
let count2 = 0;
|
||||
const loader2 = function(bbox, resolution, projection) {
|
||||
const loader2 = function (bbox, resolution, projection) {
|
||||
count2++;
|
||||
};
|
||||
const source = new VectorSource({loader: loader1});
|
||||
source.loadFeatures([-10000, -10000, 10000, 10000], 1,
|
||||
getProjection('EPSG:3857'));
|
||||
source.loadFeatures(
|
||||
[-10000, -10000, 10000, 10000],
|
||||
1,
|
||||
getProjection('EPSG:3857')
|
||||
);
|
||||
source.setLoader(loader2);
|
||||
source.refresh();
|
||||
source.loadFeatures([-10000, -10000, 10000, 10000], 1,
|
||||
getProjection('EPSG:3857'));
|
||||
source.loadFeatures(
|
||||
[-10000, -10000, 10000, 10000],
|
||||
1,
|
||||
getProjection('EPSG:3857')
|
||||
);
|
||||
expect(count1).to.eql(1);
|
||||
expect(count2).to.eql(1);
|
||||
});
|
||||
|
||||
it('removes extents with #removeLoadedExtent()', function(done) {
|
||||
it('removes extents with #removeLoadedExtent()', function (done) {
|
||||
const source = new VectorSource();
|
||||
source.setLoader(function(bbox, resolution, projection) {
|
||||
setTimeout(function() {
|
||||
source.setLoader(function (bbox, resolution, projection) {
|
||||
setTimeout(function () {
|
||||
expect(source.loadedExtentsRtree_.getAll()).to.have.length(1);
|
||||
source.removeLoadedExtent(bbox);
|
||||
expect(source.loadedExtentsRtree_.getAll()).to.have.length(0);
|
||||
done();
|
||||
}, 0);
|
||||
});
|
||||
source.loadFeatures([-10000, -10000, 10000, 10000], 1, getProjection('EPSG:3857'));
|
||||
source.loadFeatures(
|
||||
[-10000, -10000, 10000, 10000],
|
||||
1,
|
||||
getProjection('EPSG:3857')
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('the feature id index', function() {
|
||||
describe('the feature id index', function () {
|
||||
let source;
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
source = new VectorSource();
|
||||
});
|
||||
|
||||
it('ignores features with the same id', function() {
|
||||
it('ignores features with the same id', function () {
|
||||
const feature = new Feature();
|
||||
feature.setId('foo');
|
||||
source.addFeature(feature);
|
||||
@@ -683,7 +681,7 @@ describe('ol.source.Vector', function() {
|
||||
expect(source.getFeatureById('foo')).to.be(feature);
|
||||
});
|
||||
|
||||
it('allows changing feature and set the same id', function() {
|
||||
it('allows changing feature and set the same id', function () {
|
||||
const foo = new Feature();
|
||||
foo.setId('foo');
|
||||
source.addFeature(foo);
|
||||
@@ -693,57 +691,55 @@ describe('ol.source.Vector', function() {
|
||||
bar.setId('foo');
|
||||
expect(source.getFeatureById('foo')).to.be(bar);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('the undefined feature id index', function() {
|
||||
describe('the undefined feature id index', function () {
|
||||
let source;
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
source = new VectorSource();
|
||||
});
|
||||
|
||||
it('disallows adding the same feature twice', function() {
|
||||
it('disallows adding the same feature twice', function () {
|
||||
const feature = new Feature();
|
||||
source.addFeature(feature);
|
||||
expect(function() {
|
||||
expect(function () {
|
||||
source.addFeature(feature);
|
||||
}).to.throwException();
|
||||
});
|
||||
});
|
||||
|
||||
describe('with useSpatialIndex set to false', function() {
|
||||
describe('with useSpatialIndex set to false', function () {
|
||||
let source;
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
source = new VectorSource({useSpatialIndex: false});
|
||||
});
|
||||
|
||||
it('returns a features collection', function() {
|
||||
it('returns a features collection', function () {
|
||||
expect(source.getFeaturesCollection()).to.be.a(Collection);
|
||||
});
|
||||
|
||||
it('#forEachFeatureInExtent loops through all features', function() {
|
||||
it('#forEachFeatureInExtent loops through all features', function () {
|
||||
source.addFeatures([new Feature(), new Feature()]);
|
||||
const spy = sinon.spy();
|
||||
source.forEachFeatureInExtent([0, 0, 0, 0], spy);
|
||||
expect(spy.callCount).to.be(2);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('with a collection of features', function() {
|
||||
describe('with a collection of features', function () {
|
||||
let collection, source;
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
source = new VectorSource({
|
||||
useSpatialIndex: false
|
||||
useSpatialIndex: false,
|
||||
});
|
||||
collection = source.getFeaturesCollection();
|
||||
});
|
||||
|
||||
it('creates a features collection', function() {
|
||||
it('creates a features collection', function () {
|
||||
expect(source.getFeaturesCollection()).to.not.be(null);
|
||||
});
|
||||
|
||||
it('adding/removing features keeps the collection in sync', function() {
|
||||
it('adding/removing features keeps the collection in sync', function () {
|
||||
const feature = new Feature();
|
||||
source.addFeature(feature);
|
||||
expect(collection.getLength()).to.be(1);
|
||||
@@ -751,7 +747,7 @@ describe('ol.source.Vector', function() {
|
||||
expect(collection.getLength()).to.be(0);
|
||||
});
|
||||
|
||||
it('#clear() features keeps the collection in sync', function() {
|
||||
it('#clear() features keeps the collection in sync', function () {
|
||||
const feature = new Feature();
|
||||
source.addFeatures([feature]);
|
||||
expect(collection.getLength()).to.be(1);
|
||||
@@ -763,7 +759,7 @@ describe('ol.source.Vector', function() {
|
||||
expect(collection.getLength()).to.be(0);
|
||||
});
|
||||
|
||||
it('keeps the source\'s features in sync with the collection', function() {
|
||||
it("keeps the source's features in sync with the collection", function () {
|
||||
const feature = new Feature();
|
||||
collection.push(feature);
|
||||
expect(source.getFeatures().length).to.be(1);
|
||||
@@ -775,9 +771,9 @@ describe('ol.source.Vector', function() {
|
||||
expect(source.getFeatures().length).to.be(0);
|
||||
});
|
||||
|
||||
it('prevents adding two features with a duplicate id in the collection', function() {
|
||||
it('prevents adding two features with a duplicate id in the collection', function () {
|
||||
source = new VectorSource({
|
||||
features: new Collection()
|
||||
features: new Collection(),
|
||||
});
|
||||
const feature1 = new Feature();
|
||||
feature1.setId('1');
|
||||
@@ -790,20 +786,20 @@ describe('ol.source.Vector', function() {
|
||||
});
|
||||
});
|
||||
|
||||
describe('with a collection of features plus spatial index', function() {
|
||||
describe('with a collection of features plus spatial index', function () {
|
||||
let collection, source;
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
collection = new Collection();
|
||||
source = new VectorSource({
|
||||
features: collection
|
||||
features: collection,
|
||||
});
|
||||
});
|
||||
|
||||
it('#getFeaturesCollection returns the configured collection', function() {
|
||||
it('#getFeaturesCollection returns the configured collection', function () {
|
||||
expect(source.getFeaturesCollection()).to.equal(collection);
|
||||
});
|
||||
|
||||
it('adding/removing features keeps the collection in sync', function() {
|
||||
it('adding/removing features keeps the collection in sync', function () {
|
||||
const feature = new Feature();
|
||||
source.addFeature(feature);
|
||||
expect(collection.getLength()).to.be(1);
|
||||
@@ -811,7 +807,7 @@ describe('ol.source.Vector', function() {
|
||||
expect(collection.getLength()).to.be(0);
|
||||
});
|
||||
|
||||
it('#clear() features keeps the collection in sync', function() {
|
||||
it('#clear() features keeps the collection in sync', function () {
|
||||
const feature = new Feature();
|
||||
source.addFeatures([feature]);
|
||||
expect(collection.getLength()).to.be(1);
|
||||
@@ -823,7 +819,7 @@ describe('ol.source.Vector', function() {
|
||||
expect(collection.getLength()).to.be(0);
|
||||
});
|
||||
|
||||
it('keeps the source\'s features in sync with the collection', function() {
|
||||
it("keeps the source's features in sync with the collection", function () {
|
||||
const feature = new Feature();
|
||||
collection.push(feature);
|
||||
expect(source.getFeatures().length).to.be(1);
|
||||
@@ -834,7 +830,5 @@ describe('ol.source.Vector', function() {
|
||||
collection.clear();
|
||||
expect(source.getFeatures().length).to.be(0);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user