ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make code prettier

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

260
test/spec/ol/render/canvas/immediate.test.js
View File

@@ -1,4 +1,7 @@
import CanvasImmediateRenderer from '../../../../../src/ol/render/canvas/Immediate.js';
import Circle from '../../../../../src/ol/geom/Circle.js';
import CircleStyle from '../../../../../src/ol/style/Circle.js';
import Fill from '../../../../../src/ol/style/Fill.js';
import GeometryCollection from '../../../../../src/ol/geom/GeometryCollection.js';
import LineString from '../../../../../src/ol/geom/LineString.js';
import MultiLineString from '../../../../../src/ol/geom/MultiLineString.js';
@@ -6,17 +9,12 @@ import MultiPoint from '../../../../../src/ol/geom/MultiPoint.js';
import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
import Point from '../../../../../src/ol/geom/Point.js';
import Polygon from '../../../../../src/ol/geom/Polygon.js';
import VectorContext from '../../../../../src/ol/render/VectorContext.js';
import CanvasImmediateRenderer from '../../../../../src/ol/render/canvas/Immediate.js';
import CircleStyle from '../../../../../src/ol/style/Circle.js';
import Fill from '../../../../../src/ol/style/Fill.js';
import Stroke from '../../../../../src/ol/style/Stroke.js';
import Style from '../../../../../src/ol/style/Style.js';
import Text from '../../../../../src/ol/style/Text.js';
import VectorContext from '../../../../../src/ol/render/VectorContext.js';
describe('ol.render.canvas.Immediate', function() {
describe('ol.render.canvas.Immediate', function () {
function getMockContext() {
return {
setLineDash: sinon.spy(),
@@ -24,20 +22,20 @@ describe('ol.render.canvas.Immediate', function() {
closePath: sinon.spy(),
stroke: sinon.spy(),
lineTo: sinon.spy(),
moveTo: sinon.spy()
moveTo: sinon.spy(),
};
}
describe('constructor', function() {
it('creates an instance', function() {
describe('constructor', function () {
it('creates an instance', function () {
const instance = new CanvasImmediateRenderer();
expect(instance).to.be.a(CanvasImmediateRenderer);
expect(instance).to.be.a(VectorContext);
});
});
describe('#setStyle()', function() {
it('calls the more specific methods with style parts', function() {
describe('#setStyle()', function () {
it('calls the more specific methods with style parts', function () {
const context = new CanvasImmediateRenderer();
sinon.spy(context, 'setFillStrokeStyle');
sinon.spy(context, 'setImageStyle');
@@ -50,84 +48,128 @@ describe('ol.render.canvas.Immediate', function() {
fill: fill,
stroke: stroke,
image: image,
text: text
text: text,
});
context.setStyle(style);
expect(context.setFillStrokeStyle.calledOnce).to.be(true);
expect(context.setFillStrokeStyle.firstCall.calledWithExactly(fill, stroke)).to.be(true);
expect(
context.setFillStrokeStyle.firstCall.calledWithExactly(fill, stroke)
).to.be(true);
expect(context.setImageStyle.calledOnce).to.be(true);
expect(context.setImageStyle.firstCall.calledWithExactly(image)).to.be(true);
expect(context.setImageStyle.firstCall.calledWithExactly(image)).to.be(
true
);
expect(context.setTextStyle.calledOnce).to.be(true);
expect(context.setTextStyle.firstCall.calledWithExactly(text)).to.be(true);
expect(context.setTextStyle.firstCall.calledWithExactly(text)).to.be(
true
);
});
});
describe('#drawGeometry()', function() {
describe('#drawGeometry()', function () {
const extent = [-10, -10, 10, 10];
it('calls drawPoint() with a Point', function() {
it('calls drawPoint() with a Point', function () {
const context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawPoint');
const geometry = new Point([1, 2]);
context.drawGeometry(geometry);
expect(context.drawPoint.calledOnce).to.be(true);
expect(context.drawPoint.firstCall.calledWithExactly(geometry)).to.be(true);
expect(context.drawPoint.firstCall.calledWithExactly(geometry)).to.be(
true
);
});
it('calls drawLineString() with a LineString', function() {
it('calls drawLineString() with a LineString', function () {
const context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawLineString');
const geometry = new LineString([[1, 2], [3, 4]]);
const geometry = new LineString([
[1, 2],
[3, 4],
]);
context.drawGeometry(geometry);
expect(context.drawLineString.calledOnce).to.be(true);
expect(context.drawLineString.firstCall.calledWithExactly(geometry)).to.be(true);
expect(
context.drawLineString.firstCall.calledWithExactly(geometry)
).to.be(true);
});
it('calls drawPolygon() with a Polygon', function() {
it('calls drawPolygon() with a Polygon', function () {
const context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawPolygon');
const geometry = new Polygon([[[1, 2], [3, 4], [5, 6], [1, 2]]]);
const geometry = new Polygon([
[
[1, 2],
[3, 4],
[5, 6],
[1, 2],
],
]);
context.drawGeometry(geometry);
expect(context.drawPolygon.calledOnce).to.be(true);
expect(context.drawPolygon.firstCall.calledWithExactly(geometry)).to.be(true);
expect(context.drawPolygon.firstCall.calledWithExactly(geometry)).to.be(
true
);
});
it('calls drawMultiPoint() with a MultiPoint', function() {
it('calls drawMultiPoint() with a MultiPoint', function () {
const context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawMultiPoint');
const geometry = new MultiPoint([[1, 2], [3, 4]]);
const geometry = new MultiPoint([
[1, 2],
[3, 4],
]);
context.drawGeometry(geometry);
expect(context.drawMultiPoint.calledOnce).to.be(true);
expect(context.drawMultiPoint.firstCall.calledWithExactly(geometry)).to.be(true);
expect(
context.drawMultiPoint.firstCall.calledWithExactly(geometry)
).to.be(true);
});
it('calls drawMultiLineString() with a MultiLineString', function() {
it('calls drawMultiLineString() with a MultiLineString', function () {
const context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawMultiLineString');
const geometry = new MultiLineString([[[1, 2], [3, 4]]]);
const geometry = new MultiLineString([
[
[1, 2],
[3, 4],
],
]);
context.drawGeometry(geometry);
expect(context.drawMultiLineString.calledOnce).to.be(true);
expect(context.drawMultiLineString.firstCall.calledWithExactly(geometry)).to.be(true);
expect(
context.drawMultiLineString.firstCall.calledWithExactly(geometry)
).to.be(true);
});
it('calls drawMultiPolygon() with a MultiPolygon', function() {
it('calls drawMultiPolygon() with a MultiPolygon', function () {
const context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawMultiPolygon');
const geometry = new MultiPolygon([[[[1, 2], [3, 4], [5, 6], [1, 2]]]]);
const geometry = new MultiPolygon([
[
[
[1, 2],
[3, 4],
[5, 6],
[1, 2],
],
],
]);
context.drawGeometry(geometry);
expect(context.drawMultiPolygon.calledOnce).to.be(true);
expect(context.drawMultiPolygon.firstCall.calledWithExactly(geometry)).to.be(true);
expect(
context.drawMultiPolygon.firstCall.calledWithExactly(geometry)
).to.be(true);
});
it('calls drawGeometryCollection() with a GeometryCollection', function() {
it('calls drawGeometryCollection() with a GeometryCollection', function () {
const context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawGeometryCollection');
sinon.spy(context, 'drawPoint');
@@ -135,8 +177,18 @@ describe('ol.render.canvas.Immediate', function() {
sinon.spy(context, 'drawPolygon');
const point = new Point([1, 2]);
const linestring = new LineString([[1, 2], [3, 4]]);
const polygon = new Polygon([[[1, 2], [3, 4], [5, 6], [1, 2]]]);
const linestring = new LineString([
[1, 2],
[3, 4],
]);
const polygon = new Polygon([
[
[1, 2],
[3, 4],
[5, 6],
[1, 2],
],
]);
const geometry = new GeometryCollection([point, linestring, polygon]);
context.drawGeometry(geometry);
@@ -145,12 +197,16 @@ describe('ol.render.canvas.Immediate', function() {
expect(context.drawPoint.calledOnce).to.be(true);
expect(context.drawPoint.firstCall.calledWithExactly(point)).to.be(true);
expect(context.drawLineString.calledOnce).to.be(true);
expect(context.drawLineString.firstCall.calledWithExactly(linestring)).to.be(true);
expect(
context.drawLineString.firstCall.calledWithExactly(linestring)
).to.be(true);
expect(context.drawPolygon.calledOnce).to.be(true);
expect(context.drawPolygon.firstCall.calledWithExactly(polygon)).to.be(true);
expect(context.drawPolygon.firstCall.calledWithExactly(polygon)).to.be(
true
);
});
it('calls drawCircle() with a Circle', function() {
it('calls drawCircle() with a Circle', function () {
const context = new CanvasImmediateRenderer(getMockContext(), 1, extent);
sinon.spy(context, 'drawCircle');
@@ -158,69 +214,76 @@ describe('ol.render.canvas.Immediate', function() {
context.drawGeometry(geometry);
expect(context.drawCircle.calledOnce).to.be(true);
expect(context.drawCircle.firstCall.calledWithExactly(geometry)).to.be(true);
expect(context.drawCircle.firstCall.calledWithExactly(geometry)).to.be(
true
);
});
});
describe('#drawMultiPolygon()', function() {
it('creates the correct canvas instructions for 3D geometries', function() {
describe('#drawMultiPolygon()', function () {
it('creates the correct canvas instructions for 3D geometries', function () {
const instructions = [];
function serialize(index, instruction) {
if (!instruction) {
return 'id: ' + index + ' NO INSTRUCTION';
}
const parts = [
'id: ' + index,
'type: ' + instruction.type
];
const parts = ['id: ' + index, 'type: ' + instruction.type];
if (instruction.args) {
parts.push('args: [' + instruction.args.map(function(arg) {
if (typeof arg === 'number') {
return arg.toFixed(9);
} else {
return arg;
}
}).join(', ') + ']');
parts.push(
'args: [' +
instruction.args
.map(function (arg) {
if (typeof arg === 'number') {
return arg.toFixed(9);
} else {
return arg;
}
})
.join(', ') +
']'
);
}
return parts.join(', ');
}
const context = {
beginPath: function() {},
moveTo: function(x, y) {
beginPath: function () {},
moveTo: function (x, y) {
instructions.push({
type: 'moveTo',
args: [x, y]
args: [x, y],
});
},
lineTo: function(x, y) {
lineTo: function (x, y) {
instructions.push({
type: 'lineTo',
args: [x, y]
args: [x, y],
});
},
closePath: function() {
closePath: function () {
instructions.push({
type: 'closePath'
type: 'closePath',
});
},
setLineDash: function() {},
stroke: function() {}
setLineDash: function () {},
stroke: function () {},
};
const transform = [
0.0004088332670837288, 0,
0, -0.0004088332670837288,
4480.991370439071, 1529.5752568707105
0.0004088332670837288,
0,
0,
-0.0004088332670837288,
4480.991370439071,
1529.5752568707105,
];
const extent = [
-10960437.252092224, 2762924.0275091752,
-7572748.158493212, 3741317.9895594316
-10960437.252092224,
2762924.0275091752,
-7572748.158493212,
3741317.9895594316,
];
const canvas = new CanvasImmediateRenderer(context, 1, extent, transform);
@@ -231,29 +294,36 @@ describe('ol.render.canvas.Immediate', function() {
lineJoin: 'round',
lineWidth: 3,
miterLimit: 10,
strokeStyle: '#00FFFF'
strokeStyle: '#00FFFF',
};
const multiPolygonGeometry = new MultiPolygon([[[
// first polygon
[-80.736061, 28.788576000000006, 0], // moveTo()
[-80.763557, 28.821799999999996, 0], // lineTo()
[-80.817406, 28.895123999999996, 0], // lineTo()
[-80.891304, 29.013130000000004, 0], // lineTo()
[-80.916512, 29.071560000000005, 0], // lineTo()
[-80.899323, 29.061249000000004, 0], // lineTo()
[-80.862663, 28.991361999999995, 0], // lineTo()
[-80.736061, 28.788576000000006, 0] // closePath()
]], [[
// second polygon
[-82.102127, 26.585724, 0], // moveTo()
[-82.067139, 26.497208, 0], // lineTo()
[-82.097641, 26.493585999999993, 0], // lineTo()
[-82.135895, 26.642279000000002, 0], // lineTo()
[-82.183495, 26.683082999999996, 0], // lineTo()
[-82.128838, 26.693342, 0], // lineTo()
[-82.102127, 26.585724, 0] // closePath()
]]]).transform('EPSG:4326', 'EPSG:3857');
const multiPolygonGeometry = new MultiPolygon([
[
[
// first polygon
[-80.736061, 28.788576000000006, 0], // moveTo()
[-80.763557, 28.821799999999996, 0], // lineTo()
[-80.817406, 28.895123999999996, 0], // lineTo()
[-80.891304, 29.013130000000004, 0], // lineTo()
[-80.916512, 29.071560000000005, 0], // lineTo()
[-80.899323, 29.061249000000004, 0], // lineTo()
[-80.862663, 28.991361999999995, 0], // lineTo()
[-80.736061, 28.788576000000006, 0], // closePath()
],
],
[
[
// second polygon
[-82.102127, 26.585724, 0], // moveTo()
[-82.067139, 26.497208, 0], // lineTo()
[-82.097641, 26.493585999999993, 0], // lineTo()
[-82.135895, 26.642279000000002, 0], // lineTo()
[-82.183495, 26.683082999999996, 0], // lineTo()
[-82.128838, 26.693342, 0], // lineTo()
[-82.102127, 26.585724, 0], // closePath()
],
],
]).transform('EPSG:4326', 'EPSG:3857');
canvas.drawMultiPolygon(multiPolygonGeometry, null);
@@ -274,10 +344,9 @@ describe('ol.render.canvas.Immediate', function() {
{type: 'lineTo', args: [742.8955268835157, 270.83899948444764]},
{type: 'lineTo', args: [740.7291979946272, 268.76099731369345]},
{type: 'lineTo', args: [743.2166987946266, 268.23842607400616]},
{type: 'closePath'}
{type: 'closePath'},
];
for (let i = 0, ii = instructions.length; i < ii; ++i) {
const actualInstruction = serialize(i, instructions[i]);
const expectedInstruction = serialize(i, expected[i]);
@@ -285,7 +354,6 @@ describe('ol.render.canvas.Immediate', function() {
}
expect(instructions.length).to.equal(expected.length);
});
});
});