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

Rename ol.geom.Layout to ol.geom.GeometryLayout

Browse Source
This commit is contained in:
Tom Payne
2013-12-04 16:27:03 +01:00
parent 600cb3a0ff
commit c2228b1d19
13 changed files with 71 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/spec/ol/geom/linestring.test.js
View File

@@ -18,7 +18,7 @@ describe('ol.geom.LineString', function() {
});
it('defaults to layout XY', function() {
expect(lineString.getLayout()).to.be(ol.geom.Layout.XY);
expect(lineString.getLayout()).to.be(ol.geom.GeometryLayout.XY);
});
it('has empty coordinates', function() {
@@ -47,7 +47,7 @@ describe('ol.geom.LineString', function() {
});
it('has the expected layout', function() {
expect(lineString.getLayout()).to.be(ol.geom.Layout.XY);
expect(lineString.getLayout()).to.be(ol.geom.GeometryLayout.XY);
});
it('has the expected coordinates', function() {
@@ -76,7 +76,7 @@ describe('ol.geom.LineString', function() {
});
it('has the expected layout', function() {
expect(lineString.getLayout()).to.be(ol.geom.Layout.XYZ);
expect(lineString.getLayout()).to.be(ol.geom.GeometryLayout.XYZ);
});
it('has the expected coordinates', function() {
@@ -102,11 +102,11 @@ describe('ol.geom.LineString', function() {
var lineString;
beforeEach(function() {
lineString = new ol.geom.LineString(
[[1, 2, 3], [4, 5, 6]], ol.geom.Layout.XYM);
[[1, 2, 3], [4, 5, 6]], ol.geom.GeometryLayout.XYM);
});
it('has the expected layout', function() {
expect(lineString.getLayout()).to.be(ol.geom.Layout.XYM);
expect(lineString.getLayout()).to.be(ol.geom.GeometryLayout.XYM);
});
it('has the expected coordinates', function() {
@@ -135,7 +135,7 @@ describe('ol.geom.LineString', function() {
});
it('has the expected layout', function() {
expect(lineString.getLayout()).to.be(ol.geom.Layout.XYZM);
expect(lineString.getLayout()).to.be(ol.geom.GeometryLayout.XYZM);
});
it('has the expected coordinates', function() {

12
test/spec/ol/geom/multilinestring.test.js
View File

@@ -18,7 +18,7 @@ describe('ol.geom.MultiLineString', function() {
});
it('defaults to layout XY', function() {
expect(multiLineString.getLayout()).to.be(ol.geom.Layout.XY);
expect(multiLineString.getLayout()).to.be(ol.geom.GeometryLayout.XY);
});
it('has empty coordinates', function() {
@@ -48,7 +48,7 @@ describe('ol.geom.MultiLineString', function() {
});
it('has the expected layout', function() {
expect(multiLineString.getLayout()).to.be(ol.geom.Layout.XY);
expect(multiLineString.getLayout()).to.be(ol.geom.GeometryLayout.XY);
});
it('has the expected coordinates', function() {
@@ -80,7 +80,7 @@ describe('ol.geom.MultiLineString', function() {
});
it('has the expected layout', function() {
expect(multiLineString.getLayout()).to.be(ol.geom.Layout.XYZ);
expect(multiLineString.getLayout()).to.be(ol.geom.GeometryLayout.XYZ);
});
it('has the expected coordinates', function() {
@@ -109,11 +109,11 @@ describe('ol.geom.MultiLineString', function() {
beforeEach(function() {
multiLineString = new ol.geom.MultiLineString(
[[[1, 2, 3], [4, 5, 6]], [[7, 8, 9], [10, 11, 12]]],
ol.geom.Layout.XYM);
ol.geom.GeometryLayout.XYM);
});
it('has the expected layout', function() {
expect(multiLineString.getLayout()).to.be(ol.geom.Layout.XYM);
expect(multiLineString.getLayout()).to.be(ol.geom.GeometryLayout.XYM);
});
it('has the expected coordinates', function() {
@@ -145,7 +145,7 @@ describe('ol.geom.MultiLineString', function() {
});
it('has the expected layout', function() {
expect(multiLineString.getLayout()).to.be(ol.geom.Layout.XYZM);
expect(multiLineString.getLayout()).to.be(ol.geom.GeometryLayout.XYZM);
});
it('has the expected coordinates', function() {

12
test/spec/ol/geom/multipoint.test.js
View File

@@ -18,7 +18,7 @@ describe('ol.geom.MultiPoint', function() {
});
it('defaults to layout XY', function() {
expect(multiPoint.getLayout()).to.be(ol.geom.Layout.XY);
expect(multiPoint.getLayout()).to.be(ol.geom.GeometryLayout.XY);
});
it('has empty coordinates', function() {
@@ -47,7 +47,7 @@ describe('ol.geom.MultiPoint', function() {
});
it('has the expected layout', function() {
expect(multiPoint.getLayout()).to.be(ol.geom.Layout.XY);
expect(multiPoint.getLayout()).to.be(ol.geom.GeometryLayout.XY);
});
it('has the expected coordinates', function() {
@@ -76,7 +76,7 @@ describe('ol.geom.MultiPoint', function() {
});
it('has the expected layout', function() {
expect(multiPoint.getLayout()).to.be(ol.geom.Layout.XYZ);
expect(multiPoint.getLayout()).to.be(ol.geom.GeometryLayout.XYZ);
});
it('has the expected coordinates', function() {
@@ -102,11 +102,11 @@ describe('ol.geom.MultiPoint', function() {
var multiPoint;
beforeEach(function() {
multiPoint = new ol.geom.MultiPoint(
[[1, 2, 3], [4, 5, 6]], ol.geom.Layout.XYM);
[[1, 2, 3], [4, 5, 6]], ol.geom.GeometryLayout.XYM);
});
it('has the expected layout', function() {
expect(multiPoint.getLayout()).to.be(ol.geom.Layout.XYM);
expect(multiPoint.getLayout()).to.be(ol.geom.GeometryLayout.XYM);
});
it('has the expected coordinates', function() {
@@ -135,7 +135,7 @@ describe('ol.geom.MultiPoint', function() {
});
it('has the expected layout', function() {
expect(multiPoint.getLayout()).to.be(ol.geom.Layout.XYZM);
expect(multiPoint.getLayout()).to.be(ol.geom.GeometryLayout.XYZM);
});
it('has the expected coordinates', function() {

8
test/spec/ol/geom/point.test.js
View File

@@ -18,7 +18,7 @@ describe('ol.geom.Point', function() {
});
it('has the expected layout', function() {
expect(point.getLayout()).to.be(ol.geom.Layout.XY);
expect(point.getLayout()).to.be(ol.geom.GeometryLayout.XY);
});
it('has the expected coordinates', function() {
@@ -43,11 +43,11 @@ describe('ol.geom.Point', function() {
var point;
beforeEach(function() {
point = new ol.geom.Point([1, 2, 3], ol.geom.Layout.XYM);
point = new ol.geom.Point([1, 2, 3], ol.geom.GeometryLayout.XYM);
});
it('has the expected layout', function() {
expect(point.getLayout()).to.be(ol.geom.Layout.XYM);
expect(point.getLayout()).to.be(ol.geom.GeometryLayout.XYM);
});
it('has the expected coordinates', function() {
@@ -76,7 +76,7 @@ describe('ol.geom.Point', function() {
});
it('has the expected layout', function() {
expect(point.getLayout()).to.be(ol.geom.Layout.XYZM);
expect(point.getLayout()).to.be(ol.geom.GeometryLayout.XYZM);
});
it('has the expected coordinates', function() {

13
test/spec/ol/geom/polygon.test.js
View File

@@ -20,7 +20,7 @@ describe('ol.geom.Polygon', function() {
});
it('defaults to layout XY', function() {
expect(polygon.getLayout()).to.be(ol.geom.Layout.XY);
expect(polygon.getLayout()).to.be(ol.geom.GeometryLayout.XY);
});
it('has empty coordinates', function() {
@@ -56,7 +56,7 @@ describe('ol.geom.Polygon', function() {
});
it('has the expected layout', function() {
expect(polygon.getLayout()).to.be(ol.geom.Layout.XY);
expect(polygon.getLayout()).to.be(ol.geom.GeometryLayout.XY);
});
it('has the expected coordinates', function() {
@@ -119,7 +119,7 @@ describe('ol.geom.Polygon', function() {
});
it('has the expected layout', function() {
expect(polygon.getLayout()).to.be(ol.geom.Layout.XYZ);
expect(polygon.getLayout()).to.be(ol.geom.GeometryLayout.XYZ);
});
it('has the expected coordinates', function() {
@@ -174,7 +174,8 @@ describe('ol.geom.Polygon', function() {
beforeEach(function() {
outerRing = [[0, 0, 1], [4, 4, 2], [4, 0, 3]];
innerRing = [[2, 1, 4], [3, 1, 5], [3, 2, 6]];
polygon = new ol.geom.Polygon([outerRing, innerRing], ol.geom.Layout.XYM);
polygon = new ol.geom.Polygon(
[outerRing, innerRing], ol.geom.GeometryLayout.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];
@@ -182,7 +183,7 @@ describe('ol.geom.Polygon', function() {
});
it('has the expected layout', function() {
expect(polygon.getLayout()).to.be(ol.geom.Layout.XYM);
expect(polygon.getLayout()).to.be(ol.geom.GeometryLayout.XYM);
});
it('has the expected coordinates', function() {
@@ -252,7 +253,7 @@ describe('ol.geom.Polygon', function() {
});
it('has the expected layout', function() {
expect(polygon.getLayout()).to.be(ol.geom.Layout.XYZM);
expect(polygon.getLayout()).to.be(ol.geom.GeometryLayout.XYZM);
});
it('has the expected coordinates', function() {