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
2020-04-06 12:25:12 -06:00
parent 53b48baf62
commit 054af09032
790 changed files with 46833 additions and 33765 deletions

View File

@@ -1,25 +1,22 @@
import Map from '../../../../../src/ol/Map.js';
import View from '../../../../../src/ol/View.js';
import {get as getProj} from '../../../../../src/ol/proj.js';
import ImageLayer from '../../../../../src/ol/layer/Image.js';
import VectorImageLayer from '../../../../../src/ol/layer/VectorImage.js';
import Feature from '../../../../../src/ol/Feature.js';
import ImageLayer from '../../../../../src/ol/layer/Image.js';
import Map from '../../../../../src/ol/Map.js';
import Point from '../../../../../src/ol/geom/Point.js';
import Projection from '../../../../../src/ol/proj/Projection.js';
import Static from '../../../../../src/ol/source/ImageStatic.js';
import VectorImageLayer from '../../../../../src/ol/layer/VectorImage.js';
import VectorSource from '../../../../../src/ol/source/Vector.js';
import View from '../../../../../src/ol/View.js';
import {get as getProj} from '../../../../../src/ol/proj.js';
describe('ol.renderer.canvas.ImageLayer', function() {
describe('#forEachLayerAtCoordinate', function() {
describe('ol.renderer.canvas.ImageLayer', function () {
describe('#forEachLayerAtCoordinate', function () {
let map, target, source;
beforeEach(function(done) {
beforeEach(function (done) {
const projection = new Projection({
code: 'custom-image',
units: 'pixels',
extent: [0, 0, 200, 200]
extent: [0, 0, 200, 200],
});
target = document.createElement('div');
target.style.width = '100px';
@@ -28,32 +25,34 @@ describe('ol.renderer.canvas.ImageLayer', function() {
source = new Static({
url: 'spec/ol/data/dot.png',
projection: projection,
imageExtent: [0, 0, 20, 20]
imageExtent: [0, 0, 20, 20],
});
map = new Map({
pixelRatio: 1,
target: target,
layers: [new ImageLayer({
source: source
})],
layers: [
new ImageLayer({
source: source,
}),
],
view: new View({
projection: projection,
center: [10, 10],
zoom: 2,
maxZoom: 8
})
maxZoom: 8,
}),
});
source.on('imageloadend', function() {
source.on('imageloadend', function () {
done();
});
});
afterEach(function() {
afterEach(function () {
map.setTarget(null);
document.body.removeChild(target);
});
it('properly detects pixels', function() {
it('properly detects pixels', function () {
map.renderSync();
let has = false;
function hasLayer() {
@@ -67,17 +66,17 @@ describe('ol.renderer.canvas.ImageLayer', function() {
});
});
describe('Image rendering', function() {
describe('Image rendering', function () {
let map, div, layer;
beforeEach(function(done) {
beforeEach(function (done) {
const projection = getProj('EPSG:3857');
layer = new ImageLayer({
source: new Static({
url: 'spec/ol/data/osm-0-0-0.png',
imageExtent: projection.getExtent(),
projection: projection
})
projection: projection,
}),
});
div = document.createElement('div');
@@ -89,30 +88,30 @@ describe('ol.renderer.canvas.ImageLayer', function() {
layers: [layer],
view: new View({
center: [0, 0],
zoom: 2
})
zoom: 2,
}),
});
layer.getSource().on('imageloadend', function() {
layer.getSource().on('imageloadend', function () {
done();
});
});
afterEach(function() {
afterEach(function () {
map.setTarget(null);
document.body.removeChild(div);
map.dispose();
});
it('dispatches prerender and postrender events on the image layer', function(done) {
it('dispatches prerender and postrender events on the image layer', function (done) {
let prerender = 0;
let postrender = 0;
layer.on('prerender', function() {
layer.on('prerender', function () {
++prerender;
});
layer.on('postrender', function() {
layer.on('postrender', function () {
++postrender;
});
map.on('postrender', function() {
map.on('postrender', function () {
expect(prerender).to.be(1);
expect(postrender).to.be(1);
done();
@@ -120,15 +119,14 @@ describe('ol.renderer.canvas.ImageLayer', function() {
});
});
describe('Vector image rendering', function() {
describe('Vector image rendering', function () {
let map, div, layer;
beforeEach(function() {
beforeEach(function () {
layer = new VectorImageLayer({
source: new VectorSource({
features: [new Feature(new Point([0, 0]))]
})
features: [new Feature(new Point([0, 0]))],
}),
});
div = document.createElement('div');
@@ -140,32 +138,31 @@ describe('ol.renderer.canvas.ImageLayer', function() {
layers: [layer],
view: new View({
center: [0, 0],
zoom: 2
})
zoom: 2,
}),
});
});
afterEach(function() {
afterEach(function () {
map.setTarget(null);
document.body.removeChild(div);
map.dispose();
});
it('dispatches prerender and postrender events on the vector layer', function(done) {
it('dispatches prerender and postrender events on the vector layer', function (done) {
let prerender = 0;
let postrender = 0;
layer.on('prerender', function() {
layer.on('prerender', function () {
++prerender;
});
layer.on('postrender', function() {
layer.on('postrender', function () {
++postrender;
});
map.once('postrender', function() {
map.once('postrender', function () {
expect(prerender).to.be(1);
expect(postrender).to.be(1);
done();
});
});
});
});