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:
@@ -1,118 +1,202 @@
|
||||
import {intersectsLinearRing, intersectsLineString, intersectsLinearRingArray} from '../../../../../src/ol/geom/flat/intersectsextent.js';
|
||||
import {
|
||||
intersectsLineString,
|
||||
intersectsLinearRing,
|
||||
intersectsLinearRingArray,
|
||||
} from '../../../../../src/ol/geom/flat/intersectsextent.js';
|
||||
|
||||
|
||||
describe('ol.geom.flat.intersectsextent', function() {
|
||||
|
||||
describe('ol.geom.flat.intersectsextent.intersectsLineString', function() {
|
||||
describe('ol.geom.flat.intersectsextent', function () {
|
||||
describe('ol.geom.flat.intersectsextent.intersectsLineString', function () {
|
||||
let flatCoordinates;
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
flatCoordinates = [0, 0, 1, 1, 2, 2];
|
||||
});
|
||||
describe('linestring envelope does not intersect the extent', function() {
|
||||
it('returns false', function() {
|
||||
describe('linestring envelope does not intersect the extent', function () {
|
||||
it('returns false', function () {
|
||||
const extent = [3, 3, 4, 4];
|
||||
const r = intersectsLineString(
|
||||
flatCoordinates, 0, flatCoordinates.length, 2, extent);
|
||||
flatCoordinates,
|
||||
0,
|
||||
flatCoordinates.length,
|
||||
2,
|
||||
extent
|
||||
);
|
||||
expect(r).to.be(false);
|
||||
});
|
||||
});
|
||||
describe('linestring envelope within the extent', function() {
|
||||
it('returns true', function() {
|
||||
describe('linestring envelope within the extent', function () {
|
||||
it('returns true', function () {
|
||||
const extent = [-1, -1, 3, 3];
|
||||
const r = intersectsLineString(
|
||||
flatCoordinates, 0, flatCoordinates.length, 2, extent);
|
||||
flatCoordinates,
|
||||
0,
|
||||
flatCoordinates.length,
|
||||
2,
|
||||
extent
|
||||
);
|
||||
expect(r).to.be(true);
|
||||
});
|
||||
});
|
||||
describe('linestring envelope bisected by an edge of the extent',
|
||||
function() {
|
||||
it('returns true', function() {
|
||||
const extent = [-0.1, 0.1, 2.1, 0.1];
|
||||
const r = intersectsLineString(
|
||||
flatCoordinates, 0, flatCoordinates.length, 2, extent);
|
||||
expect(r).to.be(true);
|
||||
});
|
||||
describe('linestring envelope bisected by an edge of the extent', function () {
|
||||
it('returns true', function () {
|
||||
const extent = [-0.1, 0.1, 2.1, 0.1];
|
||||
const r = intersectsLineString(
|
||||
flatCoordinates,
|
||||
0,
|
||||
flatCoordinates.length,
|
||||
2,
|
||||
extent
|
||||
);
|
||||
expect(r).to.be(true);
|
||||
});
|
||||
describe('a segment intersects the extent', function() {
|
||||
it('returns true', function() {
|
||||
});
|
||||
describe('a segment intersects the extent', function () {
|
||||
it('returns true', function () {
|
||||
const extent = [-0.5, -0.5, 0.5, 0.5];
|
||||
const r = intersectsLineString(
|
||||
flatCoordinates, 0, flatCoordinates.length, 2, extent);
|
||||
flatCoordinates,
|
||||
0,
|
||||
flatCoordinates.length,
|
||||
2,
|
||||
extent
|
||||
);
|
||||
expect(r).to.be(true);
|
||||
});
|
||||
});
|
||||
describe('no segments intersect the extent', function() {
|
||||
it('returns false', function() {
|
||||
describe('no segments intersect the extent', function () {
|
||||
it('returns false', function () {
|
||||
const extent = [0.5, 1.5, 1, 1.75];
|
||||
const r = intersectsLineString(
|
||||
flatCoordinates, 0, flatCoordinates.length, 2, extent);
|
||||
flatCoordinates,
|
||||
0,
|
||||
flatCoordinates.length,
|
||||
2,
|
||||
extent
|
||||
);
|
||||
expect(r).to.be(false);
|
||||
});
|
||||
it('returns false', function() {
|
||||
it('returns false', function () {
|
||||
const extent = [1, 0.25, 1.5, 0.5];
|
||||
const r = intersectsLineString(
|
||||
flatCoordinates, 0, flatCoordinates.length, 2, extent);
|
||||
flatCoordinates,
|
||||
0,
|
||||
flatCoordinates.length,
|
||||
2,
|
||||
extent
|
||||
);
|
||||
expect(r).to.be(false);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('ol.geom.flat.intersectsextent.intersectsLinearRing', function() {
|
||||
describe('ol.geom.flat.intersectsextent.intersectsLinearRing', function () {
|
||||
let flatCoordinates;
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
flatCoordinates = [0, 0, 1, 1, 2, 0, 1, -1, 0, 0];
|
||||
});
|
||||
describe('boundary intersects the extent', function() {
|
||||
it('returns true', function() {
|
||||
describe('boundary intersects the extent', function () {
|
||||
it('returns true', function () {
|
||||
const extent = [1.5, 0.0, 2.5, 1.0];
|
||||
const r = intersectsLinearRing(
|
||||
flatCoordinates, 0, flatCoordinates.length, 2, extent);
|
||||
flatCoordinates,
|
||||
0,
|
||||
flatCoordinates.length,
|
||||
2,
|
||||
extent
|
||||
);
|
||||
expect(r).to.be(true);
|
||||
});
|
||||
});
|
||||
describe('boundary does not intersect the extent and ring does not ' +
|
||||
describe(
|
||||
'boundary does not intersect the extent and ring does not ' +
|
||||
'contain a corner of the extent',
|
||||
function() {
|
||||
it('returns false', function() {
|
||||
const extent = [2.0, 0.5, 3, 1.5];
|
||||
const r = intersectsLinearRing(
|
||||
flatCoordinates, 0, flatCoordinates.length, 2, extent);
|
||||
expect(r).to.be(false);
|
||||
});
|
||||
});
|
||||
describe('ring contains the extent', function() {
|
||||
it('returns true', function() {
|
||||
function () {
|
||||
it('returns false', function () {
|
||||
const extent = [2.0, 0.5, 3, 1.5];
|
||||
const r = intersectsLinearRing(
|
||||
flatCoordinates,
|
||||
0,
|
||||
flatCoordinates.length,
|
||||
2,
|
||||
extent
|
||||
);
|
||||
expect(r).to.be(false);
|
||||
});
|
||||
}
|
||||
);
|
||||
describe('ring contains the extent', function () {
|
||||
it('returns true', function () {
|
||||
const extent = [0.75, -0.25, 1.25, 0.25];
|
||||
const r = intersectsLinearRing(
|
||||
flatCoordinates, 0, flatCoordinates.length, 2, extent);
|
||||
flatCoordinates,
|
||||
0,
|
||||
flatCoordinates.length,
|
||||
2,
|
||||
extent
|
||||
);
|
||||
expect(r).to.be(true);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('ol.geom.flat.intersectsextent.intersectsLinearRingArray', function() {
|
||||
describe('ol.geom.flat.intersectsextent.intersectsLinearRingArray', function () {
|
||||
let flatCoordinates;
|
||||
let ends;
|
||||
beforeEach(function() {
|
||||
flatCoordinates = [0, 0, 0, 10, 10, 10, 10, 0, 0, 0, /*hole*/2, 2, 8, 2, 8, 4, 5, 5, 8, 6, 8, 8, 2, 8, 2, 2];
|
||||
beforeEach(function () {
|
||||
flatCoordinates = [
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
10,
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
/*hole*/ 2,
|
||||
2,
|
||||
8,
|
||||
2,
|
||||
8,
|
||||
4,
|
||||
5,
|
||||
5,
|
||||
8,
|
||||
6,
|
||||
8,
|
||||
8,
|
||||
2,
|
||||
8,
|
||||
2,
|
||||
2,
|
||||
];
|
||||
ends = [10, flatCoordinates.length];
|
||||
});
|
||||
describe('ring with hole where hole contains the extent', function() {
|
||||
it('returns true', function() {
|
||||
describe('ring with hole where hole contains the extent', function () {
|
||||
it('returns true', function () {
|
||||
const extent = [3, 3, 3.5, 3.5];
|
||||
const r = intersectsLinearRingArray(
|
||||
flatCoordinates, 0, ends, 2, extent);
|
||||
flatCoordinates,
|
||||
0,
|
||||
ends,
|
||||
2,
|
||||
extent
|
||||
);
|
||||
expect(r).to.be(false);
|
||||
});
|
||||
});
|
||||
describe('ring with hole intersects the extent', function() {
|
||||
it('returns true', function() {
|
||||
describe('ring with hole intersects the extent', function () {
|
||||
it('returns true', function () {
|
||||
const extent = [3, 3, 6, 6];
|
||||
const r = intersectsLinearRingArray(
|
||||
flatCoordinates, 0, ends, 2, extent);
|
||||
flatCoordinates,
|
||||
0,
|
||||
ends,
|
||||
2,
|
||||
extent
|
||||
);
|
||||
expect(r).to.be(true);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user