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,64 +1,97 @@
|
||||
import {isEmpty, boundingExtent} from '../../../../src/ol/extent.js';
|
||||
import Circle from '../../../../src/ol/geom/Circle.js';
|
||||
import LinearRing from '../../../../src/ol/geom/LinearRing.js';
|
||||
import Polygon, {fromCircle, fromExtent} from '../../../../src/ol/geom/Polygon.js';
|
||||
import Polygon, {
|
||||
fromCircle,
|
||||
fromExtent,
|
||||
} from '../../../../src/ol/geom/Polygon.js';
|
||||
import {boundingExtent, isEmpty} from '../../../../src/ol/extent.js';
|
||||
|
||||
|
||||
describe('ol/geom/Polygon', function() {
|
||||
|
||||
it('cannot be constructed with a null geometry', function() {
|
||||
expect(function() {
|
||||
describe('ol/geom/Polygon', function () {
|
||||
it('cannot be constructed with a null geometry', function () {
|
||||
expect(function () {
|
||||
return new Polygon(null);
|
||||
}).to.throwException();
|
||||
});
|
||||
|
||||
describe('construct empty', function() {
|
||||
|
||||
describe('construct empty', function () {
|
||||
let polygon;
|
||||
beforeEach(function() {
|
||||
beforeEach(function () {
|
||||
polygon = new Polygon([]);
|
||||
});
|
||||
|
||||
it('defaults to layout XY', function() {
|
||||
it('defaults to layout XY', function () {
|
||||
expect(polygon.getLayout()).to.be('XY');
|
||||
});
|
||||
|
||||
it('has empty coordinates', function() {
|
||||
it('has empty coordinates', function () {
|
||||
expect(polygon.getCoordinates()).to.be.empty();
|
||||
});
|
||||
|
||||
it('has an empty extent', function() {
|
||||
it('has an empty extent', function () {
|
||||
expect(isEmpty(polygon.getExtent())).to.be(true);
|
||||
});
|
||||
|
||||
it('has empty flat coordinates', function() {
|
||||
it('has empty flat coordinates', function () {
|
||||
expect(polygon.getFlatCoordinates()).to.be.empty();
|
||||
});
|
||||
|
||||
it('has stride the expected stride', function() {
|
||||
it('has stride the expected stride', function () {
|
||||
expect(polygon.getStride()).to.be(2);
|
||||
});
|
||||
|
||||
it('can append linear rings', function() {
|
||||
it('can append linear rings', function () {
|
||||
polygon.appendLinearRing(
|
||||
new LinearRing([[1, 2], [3, 4], [5, 6]]));
|
||||
expect(polygon.getCoordinates()).to.eql(
|
||||
[[[1, 2], [3, 4], [5, 6]]]);
|
||||
new LinearRing([
|
||||
[1, 2],
|
||||
[3, 4],
|
||||
[5, 6],
|
||||
])
|
||||
);
|
||||
expect(polygon.getCoordinates()).to.eql([
|
||||
[
|
||||
[1, 2],
|
||||
[3, 4],
|
||||
[5, 6],
|
||||
],
|
||||
]);
|
||||
polygon.appendLinearRing(
|
||||
new LinearRing([[7, 8], [9, 10], [11, 12]]));
|
||||
expect(polygon.getCoordinates()).to.eql(
|
||||
[[[1, 2], [3, 4], [5, 6]], [[7, 8], [9, 10], [11, 12]]]);
|
||||
new LinearRing([
|
||||
[7, 8],
|
||||
[9, 10],
|
||||
[11, 12],
|
||||
])
|
||||
);
|
||||
expect(polygon.getCoordinates()).to.eql([
|
||||
[
|
||||
[1, 2],
|
||||
[3, 4],
|
||||
[5, 6],
|
||||
],
|
||||
[
|
||||
[7, 8],
|
||||
[9, 10],
|
||||
[11, 12],
|
||||
],
|
||||
]);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('construct with 2D coordinates', function() {
|
||||
|
||||
describe('construct with 2D coordinates', function () {
|
||||
let outerRing, innerRing, polygon, flatCoordinates;
|
||||
let outsideOuter, inside, insideInner;
|
||||
beforeEach(function() {
|
||||
outerRing = [[0, 1], [1, 4], [4, 3], [3, 0]];
|
||||
innerRing = [[2, 2], [3, 2], [3, 3], [2, 3]];
|
||||
beforeEach(function () {
|
||||
outerRing = [
|
||||
[0, 1],
|
||||
[1, 4],
|
||||
[4, 3],
|
||||
[3, 0],
|
||||
];
|
||||
innerRing = [
|
||||
[2, 2],
|
||||
[3, 2],
|
||||
[3, 3],
|
||||
[2, 3],
|
||||
];
|
||||
polygon = new Polygon([outerRing, innerRing]);
|
||||
flatCoordinates = [0, 1, 1, 4, 4, 3, 3, 0, 2, 2, 3, 2, 3, 3, 2, 3];
|
||||
outsideOuter = [0, 4];
|
||||
@@ -66,32 +99,32 @@ describe('ol/geom/Polygon', function() {
|
||||
insideInner = [2.5, 3.5];
|
||||
});
|
||||
|
||||
it('has the expected layout', function() {
|
||||
it('has the expected layout', function () {
|
||||
expect(polygon.getLayout()).to.be('XY');
|
||||
});
|
||||
|
||||
it('has the expected coordinates', function() {
|
||||
it('has the expected coordinates', function () {
|
||||
expect(polygon.getCoordinates()).to.eql([outerRing, innerRing]);
|
||||
});
|
||||
|
||||
it('has the expected extent', function() {
|
||||
it('has the expected extent', function () {
|
||||
expect(polygon.getExtent()).to.eql([0, 0, 4, 4]);
|
||||
});
|
||||
|
||||
it('has the expected flat coordinates', function() {
|
||||
it('has the expected flat coordinates', function () {
|
||||
expect(polygon.getFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
it('has stride the expected stride', function() {
|
||||
it('has stride the expected stride', function () {
|
||||
expect(polygon.getStride()).to.be(2);
|
||||
});
|
||||
|
||||
it('can return individual rings', function() {
|
||||
it('can return individual rings', function () {
|
||||
expect(polygon.getLinearRing(0).getCoordinates()).to.eql(outerRing);
|
||||
expect(polygon.getLinearRing(1).getCoordinates()).to.eql(innerRing);
|
||||
});
|
||||
|
||||
it('has the expected rings', function() {
|
||||
it('has the expected rings', function () {
|
||||
const linearRings = polygon.getLinearRings();
|
||||
expect(linearRings).to.be.an(Array);
|
||||
expect(linearRings).to.have.length(2);
|
||||
@@ -101,7 +134,7 @@ describe('ol/geom/Polygon', function() {
|
||||
expect(linearRings[1].getCoordinates()).to.eql(innerRing);
|
||||
});
|
||||
|
||||
it('does not reverse any rings', function() {
|
||||
it('does not reverse any rings', function () {
|
||||
outerRing.reverse();
|
||||
innerRing.reverse();
|
||||
polygon = new Polygon([outerRing, innerRing]);
|
||||
@@ -110,74 +143,88 @@ describe('ol/geom/Polygon', function() {
|
||||
expect(coordinates[1]).to.eql(innerRing);
|
||||
});
|
||||
|
||||
it('does not contain outside coordinates', function() {
|
||||
it('does not contain outside coordinates', function () {
|
||||
expect(polygon.intersectsCoordinate(outsideOuter)).to.be(false);
|
||||
});
|
||||
|
||||
it('does contain inside coordinates', function() {
|
||||
it('does contain inside coordinates', function () {
|
||||
expect(polygon.intersectsCoordinate(inside)).to.be(true);
|
||||
});
|
||||
|
||||
it('does not contain inside inner coordinates', function() {
|
||||
it('does not contain inside inner coordinates', function () {
|
||||
expect(polygon.intersectsCoordinate(insideInner)).to.be(false);
|
||||
});
|
||||
|
||||
describe('#getCoordinates()', function() {
|
||||
|
||||
const cw = [[-180, -90], [-180, 90], [180, 90], [180, -90], [-180, -90]];
|
||||
const ccw = [[-180, -90], [180, -90], [180, 90], [-180, 90], [-180, -90]];
|
||||
describe('#getCoordinates()', function () {
|
||||
const cw = [
|
||||
[-180, -90],
|
||||
[-180, 90],
|
||||
[180, 90],
|
||||
[180, -90],
|
||||
[-180, -90],
|
||||
];
|
||||
const ccw = [
|
||||
[-180, -90],
|
||||
[180, -90],
|
||||
[180, 90],
|
||||
[-180, 90],
|
||||
[-180, -90],
|
||||
];
|
||||
const right = new Polygon([ccw, cw]);
|
||||
const left = new Polygon([cw, ccw]);
|
||||
|
||||
it('returns coordinates as they were constructed', function() {
|
||||
it('returns coordinates as they were constructed', function () {
|
||||
expect(right.getCoordinates()).to.eql([ccw, cw]);
|
||||
expect(left.getCoordinates()).to.eql([cw, ccw]);
|
||||
});
|
||||
|
||||
it('can return coordinates with right-hand orientation', function() {
|
||||
it('can return coordinates with right-hand orientation', function () {
|
||||
expect(right.getCoordinates(true)).to.eql([ccw, cw]);
|
||||
expect(left.getCoordinates(true)).to.eql([ccw, cw]);
|
||||
});
|
||||
|
||||
it('can return coordinates with left-hand orientation', function() {
|
||||
it('can return coordinates with left-hand orientation', function () {
|
||||
expect(right.getCoordinates(false)).to.eql([cw, ccw]);
|
||||
expect(left.getCoordinates(false)).to.eql([cw, ccw]);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#getOrientedFlatCoordinates', function() {
|
||||
|
||||
it('reverses the outer ring if necessary', function() {
|
||||
describe('#getOrientedFlatCoordinates', function () {
|
||||
it('reverses the outer ring if necessary', function () {
|
||||
outerRing.reverse();
|
||||
polygon = new Polygon([outerRing, innerRing]);
|
||||
expect(polygon.getOrientedFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
it('reverses inner rings if necessary', function() {
|
||||
it('reverses inner rings if necessary', function () {
|
||||
innerRing.reverse();
|
||||
polygon = new Polygon([outerRing, innerRing]);
|
||||
expect(polygon.getOrientedFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
it('reverses all rings if necessary', function() {
|
||||
it('reverses all rings if necessary', function () {
|
||||
outerRing.reverse();
|
||||
innerRing.reverse();
|
||||
polygon = new Polygon([outerRing, innerRing]);
|
||||
expect(polygon.getOrientedFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('construct with 3D coordinates', function() {
|
||||
|
||||
describe('construct with 3D coordinates', function () {
|
||||
let outerRing, innerRing, polygon, flatCoordinates;
|
||||
let outsideOuter, inside, insideInner;
|
||||
beforeEach(function() {
|
||||
outerRing = [[0, 0, 1], [4, 4, 2], [4, 0, 3]];
|
||||
innerRing = [[2, 1, 4], [3, 1, 5], [3, 2, 6]];
|
||||
beforeEach(function () {
|
||||
outerRing = [
|
||||
[0, 0, 1],
|
||||
[4, 4, 2],
|
||||
[4, 0, 3],
|
||||
];
|
||||
innerRing = [
|
||||
[2, 1, 4],
|
||||
[3, 1, 5],
|
||||
[3, 2, 6],
|
||||
];
|
||||
polygon = new Polygon([outerRing, innerRing]);
|
||||
flatCoordinates = [0, 0, 1, 4, 4, 2, 4, 0, 3, 2, 1, 4, 3, 1, 5, 3, 2, 6];
|
||||
outsideOuter = [1, 3];
|
||||
@@ -185,203 +232,251 @@ describe('ol/geom/Polygon', function() {
|
||||
insideInner = [2.9, 1.1];
|
||||
});
|
||||
|
||||
it('has the expected layout', function() {
|
||||
it('has the expected layout', function () {
|
||||
expect(polygon.getLayout()).to.be('XYZ');
|
||||
});
|
||||
|
||||
it('has the expected coordinates', function() {
|
||||
it('has the expected coordinates', function () {
|
||||
expect(polygon.getCoordinates()).to.eql([outerRing, innerRing]);
|
||||
});
|
||||
|
||||
it('has the expected extent', function() {
|
||||
it('has the expected extent', function () {
|
||||
expect(polygon.getExtent()).to.eql([0, 0, 4, 4]);
|
||||
});
|
||||
|
||||
it('has the expected flat coordinates', function() {
|
||||
it('has the expected flat coordinates', function () {
|
||||
expect(polygon.getFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
it('has stride the expected stride', function() {
|
||||
it('has stride the expected stride', function () {
|
||||
expect(polygon.getStride()).to.be(3);
|
||||
});
|
||||
|
||||
it('does not contain outside coordinates', function() {
|
||||
it('does not contain outside coordinates', function () {
|
||||
expect(polygon.intersectsCoordinate(outsideOuter)).to.be(false);
|
||||
});
|
||||
|
||||
it('does contain inside coordinates', function() {
|
||||
it('does contain inside coordinates', function () {
|
||||
expect(polygon.intersectsCoordinate(inside)).to.be(true);
|
||||
});
|
||||
|
||||
it('does not contain inside inner coordinates', function() {
|
||||
it('does not contain inside inner coordinates', function () {
|
||||
expect(polygon.intersectsCoordinate(insideInner)).to.be(false);
|
||||
});
|
||||
|
||||
describe('#intersectsExtent', function() {
|
||||
|
||||
it('does not intersect outside extent', function() {
|
||||
expect(polygon.intersectsExtent(
|
||||
boundingExtent([outsideOuter]))).to.be(false);
|
||||
describe('#intersectsExtent', function () {
|
||||
it('does not intersect outside extent', function () {
|
||||
expect(polygon.intersectsExtent(boundingExtent([outsideOuter]))).to.be(
|
||||
false
|
||||
);
|
||||
});
|
||||
|
||||
it('does intersect inside extent', function() {
|
||||
expect(polygon.intersectsExtent(
|
||||
boundingExtent([inside]))).to.be(true);
|
||||
it('does intersect inside extent', function () {
|
||||
expect(polygon.intersectsExtent(boundingExtent([inside]))).to.be(true);
|
||||
});
|
||||
|
||||
it('does intersect boundary extent', function() {
|
||||
it('does intersect boundary extent', function () {
|
||||
const firstMidX = (outerRing[0][0] + outerRing[1][0]) / 2;
|
||||
const firstMidY = (outerRing[0][1] + outerRing[1][1]) / 2;
|
||||
|
||||
expect(polygon.intersectsExtent(boundingExtent([[firstMidX,
|
||||
firstMidY]]))).to.be(true);
|
||||
expect(
|
||||
polygon.intersectsExtent(boundingExtent([[firstMidX, firstMidY]]))
|
||||
).to.be(true);
|
||||
});
|
||||
|
||||
it('does not intersect extent fully contained by inner ring', function() {
|
||||
expect(polygon.intersectsExtent(
|
||||
boundingExtent([insideInner]))).to.be(false);
|
||||
it('does not intersect extent fully contained by inner ring', function () {
|
||||
expect(polygon.intersectsExtent(boundingExtent([insideInner]))).to.be(
|
||||
false
|
||||
);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#getOrientedFlatCoordinates', function() {
|
||||
|
||||
it('reverses the outer ring if necessary', function() {
|
||||
describe('#getOrientedFlatCoordinates', function () {
|
||||
it('reverses the outer ring if necessary', function () {
|
||||
outerRing.reverse();
|
||||
polygon = new Polygon([outerRing, innerRing]);
|
||||
expect(polygon.getOrientedFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
it('reverses inner rings if necessary', function() {
|
||||
it('reverses inner rings if necessary', function () {
|
||||
innerRing.reverse();
|
||||
polygon = new Polygon([outerRing, innerRing]);
|
||||
expect(polygon.getOrientedFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
it('reverses all rings if necessary', function() {
|
||||
it('reverses all rings if necessary', function () {
|
||||
outerRing.reverse();
|
||||
innerRing.reverse();
|
||||
polygon = new Polygon([outerRing, innerRing]);
|
||||
expect(polygon.getOrientedFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('construct with 3D coordinates and layout XYM', function() {
|
||||
|
||||
describe('construct with 3D coordinates and layout XYM', function () {
|
||||
let outerRing, innerRing, polygon, flatCoordinates;
|
||||
let outsideOuter, inside, insideInner;
|
||||
beforeEach(function() {
|
||||
outerRing = [[0, 0, 1], [4, 4, 2], [4, 0, 3]];
|
||||
innerRing = [[2, 1, 4], [3, 1, 5], [3, 2, 6]];
|
||||
polygon = new Polygon(
|
||||
[outerRing, innerRing], 'XYM');
|
||||
beforeEach(function () {
|
||||
outerRing = [
|
||||
[0, 0, 1],
|
||||
[4, 4, 2],
|
||||
[4, 0, 3],
|
||||
];
|
||||
innerRing = [
|
||||
[2, 1, 4],
|
||||
[3, 1, 5],
|
||||
[3, 2, 6],
|
||||
];
|
||||
polygon = new Polygon([outerRing, innerRing], 'XYM');
|
||||
flatCoordinates = [0, 0, 1, 4, 4, 2, 4, 0, 3, 2, 1, 4, 3, 1, 5, 3, 2, 6];
|
||||
outsideOuter = [1, 3];
|
||||
inside = [3.5, 0.5];
|
||||
insideInner = [2.9, 1.1];
|
||||
});
|
||||
|
||||
it('has the expected layout', function() {
|
||||
it('has the expected layout', function () {
|
||||
expect(polygon.getLayout()).to.be('XYM');
|
||||
});
|
||||
|
||||
it('has the expected coordinates', function() {
|
||||
it('has the expected coordinates', function () {
|
||||
expect(polygon.getCoordinates()).to.eql([outerRing, innerRing]);
|
||||
});
|
||||
|
||||
it('has the expected extent', function() {
|
||||
it('has the expected extent', function () {
|
||||
expect(polygon.getExtent()).to.eql([0, 0, 4, 4]);
|
||||
});
|
||||
|
||||
it('has the expected flat coordinates', function() {
|
||||
it('has the expected flat coordinates', function () {
|
||||
expect(polygon.getFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
it('has stride the expected stride', function() {
|
||||
it('has stride the expected stride', function () {
|
||||
expect(polygon.getStride()).to.be(3);
|
||||
});
|
||||
|
||||
it('does not contain outside coordinates', function() {
|
||||
it('does not contain outside coordinates', function () {
|
||||
expect(polygon.intersectsCoordinate(outsideOuter)).to.be(false);
|
||||
});
|
||||
|
||||
it('does contain inside coordinates', function() {
|
||||
it('does contain inside coordinates', function () {
|
||||
expect(polygon.intersectsCoordinate(inside)).to.be(true);
|
||||
});
|
||||
|
||||
it('does not contain inside inner coordinates', function() {
|
||||
it('does not contain inside inner coordinates', function () {
|
||||
expect(polygon.intersectsCoordinate(insideInner)).to.be(false);
|
||||
});
|
||||
|
||||
describe('#intersectsExtent', function() {
|
||||
|
||||
it('does not intersect outside extent', function() {
|
||||
expect(polygon.intersectsExtent(
|
||||
boundingExtent([outsideOuter]))).to.be(false);
|
||||
describe('#intersectsExtent', function () {
|
||||
it('does not intersect outside extent', function () {
|
||||
expect(polygon.intersectsExtent(boundingExtent([outsideOuter]))).to.be(
|
||||
false
|
||||
);
|
||||
});
|
||||
|
||||
it('does intersect inside extent', function() {
|
||||
expect(polygon.intersectsExtent(
|
||||
boundingExtent([inside]))).to.be(true);
|
||||
it('does intersect inside extent', function () {
|
||||
expect(polygon.intersectsExtent(boundingExtent([inside]))).to.be(true);
|
||||
});
|
||||
|
||||
it('does intersect boundary extent', function() {
|
||||
it('does intersect boundary extent', function () {
|
||||
const firstMidX = (outerRing[0][0] + outerRing[1][0]) / 2;
|
||||
const firstMidY = (outerRing[0][1] + outerRing[1][1]) / 2;
|
||||
|
||||
expect(polygon.intersectsExtent(boundingExtent([[firstMidX,
|
||||
firstMidY]]))).to.be(true);
|
||||
expect(
|
||||
polygon.intersectsExtent(boundingExtent([[firstMidX, firstMidY]]))
|
||||
).to.be(true);
|
||||
});
|
||||
|
||||
it('does not intersect extent fully contained by inner ring', function() {
|
||||
expect(polygon.intersectsExtent(
|
||||
boundingExtent([insideInner]))).to.be(false);
|
||||
it('does not intersect extent fully contained by inner ring', function () {
|
||||
expect(polygon.intersectsExtent(boundingExtent([insideInner]))).to.be(
|
||||
false
|
||||
);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#getOrientedFlatCoordinates', function() {
|
||||
|
||||
it('reverses the outer ring if necessary', function() {
|
||||
describe('#getOrientedFlatCoordinates', function () {
|
||||
it('reverses the outer ring if necessary', function () {
|
||||
outerRing.reverse();
|
||||
polygon = new Polygon([outerRing, innerRing]);
|
||||
expect(polygon.getOrientedFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
it('reverses inner rings if necessary', function() {
|
||||
it('reverses inner rings if necessary', function () {
|
||||
innerRing.reverse();
|
||||
polygon = new Polygon([outerRing, innerRing]);
|
||||
expect(polygon.getOrientedFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
it('reverses all rings if necessary', function() {
|
||||
it('reverses all rings if necessary', function () {
|
||||
outerRing.reverse();
|
||||
innerRing.reverse();
|
||||
polygon = new Polygon([outerRing, innerRing]);
|
||||
expect(polygon.getOrientedFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('construct with 4D coordinates', function() {
|
||||
|
||||
describe('construct with 4D coordinates', function () {
|
||||
let outerRing, innerRing1, innerRing2, polygon, flatCoordinates;
|
||||
let outsideOuter, inside, insideInner1, insideInner2;
|
||||
beforeEach(function() {
|
||||
outerRing = [[0, 6, 1, 2], [6, 6, 3, 4], [3, 0, 5, 6]];
|
||||
innerRing1 =
|
||||
[[2, 4, 7, 8], [4, 4, 9, 10], [4, 5, 11, 12], [2, 5, 13, 14]];
|
||||
innerRing2 = [[3, 2, 15, 16], [4, 3, 17, 18], [2, 3, 19, 20]];
|
||||
beforeEach(function () {
|
||||
outerRing = [
|
||||
[0, 6, 1, 2],
|
||||
[6, 6, 3, 4],
|
||||
[3, 0, 5, 6],
|
||||
];
|
||||
innerRing1 = [
|
||||
[2, 4, 7, 8],
|
||||
[4, 4, 9, 10],
|
||||
[4, 5, 11, 12],
|
||||
[2, 5, 13, 14],
|
||||
];
|
||||
innerRing2 = [
|
||||
[3, 2, 15, 16],
|
||||
[4, 3, 17, 18],
|
||||
[2, 3, 19, 20],
|
||||
];
|
||||
polygon = new Polygon([outerRing, innerRing1, innerRing2]);
|
||||
flatCoordinates = [
|
||||
0, 6, 1, 2, 6, 6, 3, 4, 3, 0, 5, 6,
|
||||
2, 4, 7, 8, 4, 4, 9, 10, 4, 5, 11, 12, 2, 5, 13, 14,
|
||||
3, 2, 15, 16, 4, 3, 17, 18, 2, 3, 19, 20
|
||||
0,
|
||||
6,
|
||||
1,
|
||||
2,
|
||||
6,
|
||||
6,
|
||||
3,
|
||||
4,
|
||||
3,
|
||||
0,
|
||||
5,
|
||||
6,
|
||||
2,
|
||||
4,
|
||||
7,
|
||||
8,
|
||||
4,
|
||||
4,
|
||||
9,
|
||||
10,
|
||||
4,
|
||||
5,
|
||||
11,
|
||||
12,
|
||||
2,
|
||||
5,
|
||||
13,
|
||||
14,
|
||||
3,
|
||||
2,
|
||||
15,
|
||||
16,
|
||||
4,
|
||||
3,
|
||||
17,
|
||||
18,
|
||||
2,
|
||||
3,
|
||||
19,
|
||||
20,
|
||||
];
|
||||
outsideOuter = [1, 1];
|
||||
inside = [3, 1];
|
||||
@@ -389,161 +484,235 @@ describe('ol/geom/Polygon', function() {
|
||||
insideInner2 = [3, 2.5];
|
||||
});
|
||||
|
||||
it('has the expected layout', function() {
|
||||
it('has the expected layout', function () {
|
||||
expect(polygon.getLayout()).to.be('XYZM');
|
||||
});
|
||||
|
||||
it('has the expected coordinates', function() {
|
||||
expect(polygon.getCoordinates()).to.eql(
|
||||
[outerRing, innerRing1, innerRing2]);
|
||||
it('has the expected coordinates', function () {
|
||||
expect(polygon.getCoordinates()).to.eql([
|
||||
outerRing,
|
||||
innerRing1,
|
||||
innerRing2,
|
||||
]);
|
||||
});
|
||||
|
||||
it('has the expected extent', function() {
|
||||
it('has the expected extent', function () {
|
||||
expect(polygon.getExtent()).to.eql([0, 0, 6, 6]);
|
||||
});
|
||||
|
||||
it('has the expected flat coordinates', function() {
|
||||
it('has the expected flat coordinates', function () {
|
||||
expect(polygon.getFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
it('has stride the expected stride', function() {
|
||||
it('has stride the expected stride', function () {
|
||||
expect(polygon.getStride()).to.be(4);
|
||||
});
|
||||
|
||||
it('does not contain outside coordinates', function() {
|
||||
it('does not contain outside coordinates', function () {
|
||||
expect(polygon.intersectsCoordinate(outsideOuter)).to.be(false);
|
||||
});
|
||||
|
||||
it('does contain inside coordinates', function() {
|
||||
it('does contain inside coordinates', function () {
|
||||
expect(polygon.intersectsCoordinate(inside)).to.be(true);
|
||||
});
|
||||
|
||||
it('does not contain inside inner coordinates', function() {
|
||||
it('does not contain inside inner coordinates', function () {
|
||||
expect(polygon.intersectsCoordinate(insideInner1)).to.be(false);
|
||||
expect(polygon.intersectsCoordinate(insideInner2)).to.be(false);
|
||||
});
|
||||
|
||||
describe('#intersectsExtent', function() {
|
||||
|
||||
it('does not intersect outside extent', function() {
|
||||
expect(polygon.intersectsExtent(
|
||||
boundingExtent([outsideOuter]))).to.be(false);
|
||||
describe('#intersectsExtent', function () {
|
||||
it('does not intersect outside extent', function () {
|
||||
expect(polygon.intersectsExtent(boundingExtent([outsideOuter]))).to.be(
|
||||
false
|
||||
);
|
||||
});
|
||||
|
||||
it('does intersect inside extent', function() {
|
||||
expect(polygon.intersectsExtent(
|
||||
boundingExtent([inside]))).to.be(true);
|
||||
it('does intersect inside extent', function () {
|
||||
expect(polygon.intersectsExtent(boundingExtent([inside]))).to.be(true);
|
||||
});
|
||||
|
||||
it('does intersect boundary extent', function() {
|
||||
it('does intersect boundary extent', function () {
|
||||
const firstMidX = (outerRing[0][0] + outerRing[1][0]) / 2;
|
||||
const firstMidY = (outerRing[0][1] + outerRing[1][1]) / 2;
|
||||
|
||||
expect(polygon.intersectsExtent(boundingExtent([[firstMidX,
|
||||
firstMidY]]))).to.be(true);
|
||||
expect(
|
||||
polygon.intersectsExtent(boundingExtent([[firstMidX, firstMidY]]))
|
||||
).to.be(true);
|
||||
});
|
||||
|
||||
it('does not intersect extent fully contained by inner ring', function() {
|
||||
expect(polygon.intersectsExtent(
|
||||
boundingExtent([insideInner1]))).to.be(false);
|
||||
expect(polygon.intersectsExtent(
|
||||
boundingExtent([insideInner2]))).to.be(false);
|
||||
it('does not intersect extent fully contained by inner ring', function () {
|
||||
expect(polygon.intersectsExtent(boundingExtent([insideInner1]))).to.be(
|
||||
false
|
||||
);
|
||||
expect(polygon.intersectsExtent(boundingExtent([insideInner2]))).to.be(
|
||||
false
|
||||
);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#getOrientedFlatCoordinates', function() {
|
||||
|
||||
it('reverses the outer ring if necessary', function() {
|
||||
describe('#getOrientedFlatCoordinates', function () {
|
||||
it('reverses the outer ring if necessary', function () {
|
||||
outerRing.reverse();
|
||||
polygon = new Polygon([outerRing, innerRing1, innerRing2]);
|
||||
expect(polygon.getOrientedFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
it('reverses inner rings if necessary', function() {
|
||||
it('reverses inner rings if necessary', function () {
|
||||
innerRing1.reverse();
|
||||
innerRing2.reverse();
|
||||
polygon = new Polygon([outerRing, innerRing1, innerRing2]);
|
||||
expect(polygon.getOrientedFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
it('reverses all rings if necessary', function() {
|
||||
it('reverses all rings if necessary', function () {
|
||||
outerRing.reverse();
|
||||
innerRing1.reverse();
|
||||
innerRing2.reverse();
|
||||
polygon = new Polygon([outerRing, innerRing1, innerRing2]);
|
||||
expect(polygon.getOrientedFlatCoordinates()).to.eql(flatCoordinates);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('with a simple polygon', function() {
|
||||
|
||||
describe('with a simple polygon', function () {
|
||||
let polygon;
|
||||
beforeEach(function() {
|
||||
polygon = new Polygon(
|
||||
[[[3, 0], [1, 3], [0, 6], [2, 6], [3, 7], [4, 6], [6, 6], [4, 3]]]);
|
||||
beforeEach(function () {
|
||||
polygon = new Polygon([
|
||||
[
|
||||
[3, 0],
|
||||
[1, 3],
|
||||
[0, 6],
|
||||
[2, 6],
|
||||
[3, 7],
|
||||
[4, 6],
|
||||
[6, 6],
|
||||
[4, 3],
|
||||
],
|
||||
]);
|
||||
});
|
||||
|
||||
describe('#getSimplifiedGeometry', function() {
|
||||
|
||||
it('returns the expected result', function() {
|
||||
describe('#getSimplifiedGeometry', function () {
|
||||
it('returns the expected result', function () {
|
||||
const simplifiedGeometry = polygon.getSimplifiedGeometry(9);
|
||||
expect(simplifiedGeometry).to.be.an(Polygon);
|
||||
expect(simplifiedGeometry.getCoordinates()).to.eql(
|
||||
[[[3, 0], [0, 3], [0, 6], [6, 6], [3, 3]]]);
|
||||
expect(simplifiedGeometry.getCoordinates()).to.eql([
|
||||
[
|
||||
[3, 0],
|
||||
[0, 3],
|
||||
[0, 6],
|
||||
[6, 6],
|
||||
[3, 3],
|
||||
],
|
||||
]);
|
||||
});
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
describe('#scale()', function() {
|
||||
|
||||
it('scales a polygon', function() {
|
||||
describe('#scale()', function () {
|
||||
it('scales a polygon', function () {
|
||||
const geom = new Polygon([
|
||||
[[-1, -2], [1, -2], [1, 2], [-1, 2], [-1, -2]]
|
||||
[
|
||||
[-1, -2],
|
||||
[1, -2],
|
||||
[1, 2],
|
||||
[-1, 2],
|
||||
[-1, -2],
|
||||
],
|
||||
]);
|
||||
geom.scale(10);
|
||||
const coordinates = geom.getCoordinates();
|
||||
expect(coordinates).to.eql([[[-10, -20], [10, -20], [10, 20], [-10, 20], [-10, -20]]]);
|
||||
expect(coordinates).to.eql([
|
||||
[
|
||||
[-10, -20],
|
||||
[10, -20],
|
||||
[10, 20],
|
||||
[-10, 20],
|
||||
[-10, -20],
|
||||
],
|
||||
]);
|
||||
});
|
||||
|
||||
it('accepts sx and sy', function() {
|
||||
it('accepts sx and sy', function () {
|
||||
const geom = new Polygon([
|
||||
[[-1, -2], [1, -2], [1, 2], [-1, 2], [-1, -2]]
|
||||
[
|
||||
[-1, -2],
|
||||
[1, -2],
|
||||
[1, 2],
|
||||
[-1, 2],
|
||||
[-1, -2],
|
||||
],
|
||||
]);
|
||||
geom.scale(2, 3);
|
||||
const coordinates = geom.getCoordinates();
|
||||
expect(coordinates).to.eql([[[-2, -6], [2, -6], [2, 6], [-2, 6], [-2, -6]]]);
|
||||
expect(coordinates).to.eql([
|
||||
[
|
||||
[-2, -6],
|
||||
[2, -6],
|
||||
[2, 6],
|
||||
[-2, 6],
|
||||
[-2, -6],
|
||||
],
|
||||
]);
|
||||
});
|
||||
|
||||
it('accepts an anchor', function() {
|
||||
it('accepts an anchor', function () {
|
||||
const geom = new Polygon([
|
||||
[[-1, -2], [1, -2], [1, 2], [-1, 2], [-1, -2]]
|
||||
[
|
||||
[-1, -2],
|
||||
[1, -2],
|
||||
[1, 2],
|
||||
[-1, 2],
|
||||
[-1, -2],
|
||||
],
|
||||
]);
|
||||
geom.scale(3, 2, [-1, -2]);
|
||||
const coordinates = geom.getCoordinates();
|
||||
expect(coordinates).to.eql([[[-1, -2], [5, -2], [5, 6], [-1, 6], [-1, -2]]]);
|
||||
expect(coordinates).to.eql([
|
||||
[
|
||||
[-1, -2],
|
||||
[5, -2],
|
||||
[5, 6],
|
||||
[-1, 6],
|
||||
[-1, -2],
|
||||
],
|
||||
]);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('#getInteriorPoint', function() {
|
||||
|
||||
it('returns XYM point with intersection width as M', function() {
|
||||
const geom = new Polygon([[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]]);
|
||||
describe('#getInteriorPoint', function () {
|
||||
it('returns XYM point with intersection width as M', function () {
|
||||
const geom = new Polygon([
|
||||
[
|
||||
[0, 0],
|
||||
[0, 1],
|
||||
[1, 1],
|
||||
[1, 0],
|
||||
[0, 0],
|
||||
],
|
||||
]);
|
||||
const interiorPoint = geom.getInteriorPoint();
|
||||
expect(interiorPoint.getType()).to.be('Point');
|
||||
expect(interiorPoint.layout).to.be('XYM');
|
||||
expect(interiorPoint.getCoordinates()).to.eql([0.5, 0.5, 1]);
|
||||
});
|
||||
|
||||
it('returns XYM point for donut polygons', function() {
|
||||
it('returns XYM point for donut polygons', function () {
|
||||
const geom = new Polygon([
|
||||
[[0.5, 0.5], [0.5, 2.5], [2.5, 2.5], [2.5, 0.5], [0.5, 0.5]],
|
||||
[[1, 1], [2, 1], [2, 2], [1, 2], [1, 1]]
|
||||
[
|
||||
[0.5, 0.5],
|
||||
[0.5, 2.5],
|
||||
[2.5, 2.5],
|
||||
[2.5, 0.5],
|
||||
[0.5, 0.5],
|
||||
],
|
||||
[
|
||||
[1, 1],
|
||||
[2, 1],
|
||||
[2, 2],
|
||||
[1, 2],
|
||||
[1, 1],
|
||||
],
|
||||
]);
|
||||
const interiorPoint = geom.getInteriorPoint();
|
||||
expect(interiorPoint.getType()).to.be('Point');
|
||||
@@ -552,22 +721,19 @@ describe('ol/geom/Polygon', function() {
|
||||
});
|
||||
});
|
||||
|
||||
describe('fromExtent()', function() {
|
||||
it('creates the correct polygon', function() {
|
||||
describe('fromExtent()', function () {
|
||||
it('creates the correct polygon', function () {
|
||||
const extent = [1, 2, 3, 5];
|
||||
const polygon = fromExtent(extent);
|
||||
const flatCoordinates = polygon.getFlatCoordinates();
|
||||
expect(flatCoordinates).to.eql(
|
||||
[1, 2, 1, 5, 3, 5, 3, 2, 1, 2]);
|
||||
expect(flatCoordinates).to.eql([1, 2, 1, 5, 3, 5, 3, 2, 1, 2]);
|
||||
const orientedFlatCoordinates = polygon.getOrientedFlatCoordinates();
|
||||
expect(orientedFlatCoordinates).to.eql(
|
||||
[1, 2, 1, 5, 3, 5, 3, 2, 1, 2]);
|
||||
expect(orientedFlatCoordinates).to.eql([1, 2, 1, 5, 3, 5, 3, 2, 1, 2]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('fromCircle()', function() {
|
||||
|
||||
it('creates a regular polygon', function() {
|
||||
describe('fromCircle()', function () {
|
||||
it('creates a regular polygon', function () {
|
||||
const circle = new Circle([0, 0, 0], 1, 'XYZ');
|
||||
const polygon = fromCircle(circle);
|
||||
const coordinates = polygon.getLinearRing(0).getCoordinates();
|
||||
@@ -588,7 +754,7 @@ describe('ol/geom/Polygon', function() {
|
||||
expect(coordinates[24][1]).to.roughlyEqual(-1, 1e-9);
|
||||
});
|
||||
|
||||
it('creates a regular polygon with custom sides and angle', function() {
|
||||
it('creates a regular polygon with custom sides and angle', function () {
|
||||
const circle = new Circle([0, 0], 1);
|
||||
const polygon = fromCircle(circle, 4, Math.PI / 2);
|
||||
const coordinates = polygon.getLinearRing(0).getCoordinates();
|
||||
@@ -605,5 +771,4 @@ describe('ol/geom/Polygon', function() {
|
||||
expect(coordinates[0][3]).to.eql(1);
|
||||
});
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user