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

Rename _ol_geom_MultiPolygon_ to MultiPolygon

Browse Source
This commit is contained in:
Tim Schaub
2017-12-14 08:56:51 -07:00
parent c502f016f7
commit 9d396280b0
30 changed files with 124 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/geom/flat/center.test.js
+4 -4
View File
@@ -1,5 +1,5 @@
import _ol_geom_flat_center_ from '../../../../../src/ol/geom/flat/center.js';
import _ol_geom_MultiPolygon_ from '../../../../../src/ol/geom/MultiPolygon.js';
import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
describe('ol.geom.flat.center', function() {
@@ -7,7 +7,7 @@ describe('ol.geom.flat.center', function() {
describe('ol.geom.flat.center.linearRingss', function() {
it('calculates the center of a square', function() {
var squareMultiPoly = new _ol_geom_MultiPolygon_([[
var squareMultiPoly = new MultiPolygon([[
[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]
]]);
var got = _ol_geom_flat_center_.linearRingss(
@@ -20,7 +20,7 @@ describe('ol.geom.flat.center', function() {
});
it('calculates the centers of two squares', function() {
var squareMultiPoly = new _ol_geom_MultiPolygon_([
var squareMultiPoly = new MultiPolygon([
[
[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]
],
@@ -38,7 +38,7 @@ describe('ol.geom.flat.center', function() {
});
it('does not care about holes', function() {
var polywithHole = new _ol_geom_MultiPolygon_([[
var polywithHole = new MultiPolygon([[
[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]],
[[1, 1], [1, 4], [4, 4], [4, 1], [1, 1]]
]]);
test/spec/ol/geom/flat/transform.test.js
+4 -4
View File
@@ -1,4 +1,4 @@
import _ol_geom_MultiPolygon_ from '../../../../../src/ol/geom/MultiPolygon.js';
import MultiPolygon from '../../../../../src/ol/geom/MultiPolygon.js';
import _ol_geom_SimpleGeometry_ from '../../../../../src/ol/geom/SimpleGeometry.js';
import _ol_geom_flat_transform_ from '../../../../../src/ol/geom/flat/transform.js';
@@ -9,7 +9,7 @@ describe('ol.geom.flat.transform', function() {
it('transforms a Simple Geometry to 2D', function() {
var multiPolygonGeometry = new _ol_geom_MultiPolygon_([
var multiPolygonGeometry = new MultiPolygon([
[[[-80.736061, 28.788576000000006, 0],
[-80.763557, 28.821799999999996, 0],
[-80.817406, 28.895123999999996, 0],
@@ -69,7 +69,7 @@ describe('ol.geom.flat.transform', function() {
describe('ol.geom.flat.transform.translate', function() {
it('translates the coordinates array', function() {
var multiPolygon = new _ol_geom_MultiPolygon_([
var multiPolygon = new MultiPolygon([
[[[0, 0, 2], [0, 1, 2], [1, 1, 2], [1, 0, 2], [0, 0, 2]]],
[[[2, 2, 3], [2, 3, 3], [3, 3, 3], [3, 2, 3], [2, 2, 3]]]]);
var flatCoordinates = multiPolygon.getFlatCoordinates();
@@ -86,7 +86,7 @@ describe('ol.geom.flat.transform', function() {
describe('ol.geom.flat.transform.rotate', function() {
it('rotates the coordinates array', function() {
var multiPolygon = new _ol_geom_MultiPolygon_([
var multiPolygon = new MultiPolygon([
[[[0, 0, 2], [0, 1, 2], [1, 1, 2], [1, 0, 2], [0, 0, 2]]],
[[[2, 2, 3], [2, 3, 3], [3, 3, 3], [3, 2, 3], [2, 2, 3]]]]);
var flatCoordinates = multiPolygon.getFlatCoordinates();
test/spec/ol/geom/multipolygon.test.js
+12 -12
View File
@@ -1,4 +1,4 @@
import _ol_geom_MultiPolygon_ from '../../../../src/ol/geom/MultiPolygon.js';
import MultiPolygon from '../../../../src/ol/geom/MultiPolygon.js';
import Polygon from '../../../../src/ol/geom/Polygon.js';
@@ -6,7 +6,7 @@ describe('ol.geom.MultiPolygon', function() {
it('can be constructed with a null geometry', function() {
expect(function() {
return new _ol_geom_MultiPolygon_(null);
return new MultiPolygon(null);
}).not.to.throwException();
});
@@ -14,7 +14,7 @@ describe('ol.geom.MultiPolygon', function() {
var multiPolygon;
beforeEach(function() {
multiPolygon = new _ol_geom_MultiPolygon_(null);
multiPolygon = new MultiPolygon(null);
});
it('can append polygons', function() {
@@ -37,7 +37,7 @@ describe('ol.geom.MultiPolygon', function() {
var multiPolygon;
beforeEach(function() {
multiPolygon = new _ol_geom_MultiPolygon_([]);
multiPolygon = new MultiPolygon([]);
});
it('can append polygons', function() {
@@ -59,7 +59,7 @@ describe('ol.geom.MultiPolygon', function() {
describe('#scale()', function() {
it('scales a multi-polygon', function() {
var geom = new _ol_geom_MultiPolygon_([[
var geom = new MultiPolygon([[
[[-1, -2], [1, -2], [1, 2], [-1, 2], [-1, -2]]
]]);
geom.scale(10);
@@ -68,7 +68,7 @@ describe('ol.geom.MultiPolygon', function() {
});
it('accepts sx and sy', function() {
var geom = new _ol_geom_MultiPolygon_([[
var geom = new MultiPolygon([[
[[-1, -2], [1, -2], [1, 2], [-1, 2], [-1, -2]]
]]);
geom.scale(2, 3);
@@ -77,7 +77,7 @@ describe('ol.geom.MultiPolygon', function() {
});
it('accepts an anchor', function() {
var geom = new _ol_geom_MultiPolygon_([[
var geom = new MultiPolygon([[
[[-1, -2], [1, -2], [1, 2], [-1, 2], [-1, -2]]
]]);
geom.scale(3, 2, [-1, -2]);
@@ -91,7 +91,7 @@ describe('ol.geom.MultiPolygon', function() {
var multiPolygon;
beforeEach(function() {
multiPolygon = new _ol_geom_MultiPolygon_([
multiPolygon = new MultiPolygon([
[[[0, 0], [0, 2], [1, 1], [2, 0]]],
[[[3, 0], [4, 1], [5, 2], [5, 0]]]
]);
@@ -135,8 +135,8 @@ describe('ol.geom.MultiPolygon', function() {
var cw2 = [[-140, -60], [-140, 60], [140, 60], [140, -60], [-140, -60]];
var ccw = [[-180, -90], [180, -90], [180, 90], [-180, 90], [-180, -90]];
var ccw2 = [[-140, -60], [140, -60], [140, 60], [-140, 60], [-140, -60]];
var right = new _ol_geom_MultiPolygon_([[ccw, cw], [ccw2, cw2]]);
var left = new _ol_geom_MultiPolygon_([[cw, ccw], [cw2, ccw2]]);
var right = new MultiPolygon([[ccw, cw], [ccw2, cw2]]);
var left = new MultiPolygon([[cw, ccw], [cw2, ccw2]]);
it('returns coordinates as they were constructed', function() {
expect(right.getCoordinates()).to.eql([[ccw, cw], [ccw2, cw2]]);
@@ -167,7 +167,7 @@ describe('ol.geom.MultiPolygon', function() {
it('returns the expected result', function() {
var simplifiedGeometry = multiPolygon.getSimplifiedGeometry(1);
expect(simplifiedGeometry).to.be.an(_ol_geom_MultiPolygon_);
expect(simplifiedGeometry).to.be.an(MultiPolygon);
expect(simplifiedGeometry.getCoordinates()).to.eql([
[[[0, 0], [0, 2], [2, 0]]],
[[[3, 0], [5, 2], [5, 0]]]
@@ -196,7 +196,7 @@ describe('ol.geom.MultiPolygon', function() {
describe('#getInteriorPoints', function() {
it('returns XYM multipoint with intersection width as M', function() {
var geom = new _ol_geom_MultiPolygon_([
var geom = new MultiPolygon([
[[[0, 0], [0, 1], [1, 1], [1, 0], [0, 0]]],
[[[1, 1], [1, 2], [2, 2], [2, 1], [1, 1]]]
]);