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

address review comments by @twpayne

Browse Source
This commit is contained in:
Bart van den Eijnden
2013-05-17 10:09:40 +02:00
parent bb16820ab0
commit 585887b04e
2 changed files with 98 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
test/spec/ol/parser/wkt.test.js
View File

@@ -9,6 +9,10 @@ describe('ol.parser.WKT', function() {
var geom = parser.read(wkt);
expect(geom.getCoordinates()).to.eql([30, 10]);
expect(parser.write(geom)).to.eql(wkt);
// test whitespace when reading
wkt = 'POINT (30 10)';
geom = parser.read(wkt);
expect(geom.getCoordinates()).to.eql([30, 10]);
});
it('MultiPoint read / written correctly', function() {
@@ -21,6 +25,7 @@ describe('ol.parser.WKT', function() {
expect(geom.components[2].getCoordinates()).to.eql([20, 20]);
expect(geom.components[3].getCoordinates()).to.eql([30, 10]);
expect(parser.write(geom)).to.eql(wkt);
// this has whitespace
wkt = 'MULTIPOINT (10 40, 40 30, 20 20, 30 10)';
geom = parser.read(wkt);
expect(geom.components.length).to.eql(4);
@@ -36,6 +41,11 @@ describe('ol.parser.WKT', function() {
expect(geom.getType()).to.eql(ol.geom.GeometryType.LINESTRING);
expect(geom.getCoordinates()).to.eql([[30, 10], [10, 30], [40, 40]]);
expect(parser.write(geom)).to.eql(wkt);
// test whitespace when reading
wkt = 'LINESTRING (30 10, 10 30, 40 40)';
geom = parser.read(wkt);
expect(geom.getType()).to.eql(ol.geom.GeometryType.LINESTRING);
expect(geom.getCoordinates()).to.eql([[30, 10], [10, 30], [40, 40]]);
});
it('MultiLineString read / written correctly', function() {
@@ -49,6 +59,16 @@ describe('ol.parser.WKT', function() {
expect(geom.components[0].getCoordinates()).to.eql(
[[10, 10], [20, 20], [10, 40]]);
expect(parser.write(geom)).to.eql(wkt);
// test whitespace when reading
wkt = 'MULTILINESTRING ( (10 10, 20 20, 10 40), ' +
'(40 40, 30 30, 40 20, 30 10) )';
geom = parser.read(wkt);
expect(geom.getType()).to.eql(ol.geom.GeometryType.MULTILINESTRING);
expect(geom.components.length).to.eql(2);
expect(geom.components[0].getType()).to.eql(
ol.geom.GeometryType.LINESTRING);
expect(geom.components[0].getCoordinates()).to.eql(
[[10, 10], [20, 20], [10, 40]]);
});
it('Polygon read / written correctly', function() {
@@ -71,6 +91,14 @@ describe('ol.parser.WKT', function() {
expect(geom.rings[1].getCoordinates()).to.eql(
[[20, 30], [35, 35], [30, 20], [20, 30]]);
expect(parser.write(geom)).to.eql(wkt);
// test whitespace when reading
wkt = 'POLYGON ( (30 10, 10 20, 20 40, 40 40, 30 10) )';
geom = parser.read(wkt);
expect(geom.getType()).to.eql(ol.geom.GeometryType.POLYGON);
expect(geom.rings.length).to.eql(1);
expect(geom.rings[0].getType()).to.eql(ol.geom.GeometryType.LINEARRING);
expect(geom.rings[0].getCoordinates()).to.eql(
[[30, 10], [10, 20], [20, 40], [40, 40], [30, 10]]);
});
it('MultiPolygon read / written correctly', function() {
@@ -90,6 +118,23 @@ describe('ol.parser.WKT', function() {
expect(geom.components[1].rings[1].getCoordinates()).to.eql(
[[30, 20], [20, 25], [20, 15], [30, 20]]);
expect(parser.write(geom)).to.eql(wkt);
// test whitespace when reading
wkt = 'MULTIPOLYGON( ( (40 40, 20 45, 45 30, 40 40) ), ' +
'( (20 35, 45 20, 30 5, 10 10, 10 30, 20 35 ), ( 30 20, 20 25, ' +
'20 15, 30 20 ) ) )';
geom = parser.read(wkt);
expect(geom.getType()).to.eql(ol.geom.GeometryType.MULTIPOLYGON);
expect(geom.components.length).to.eql(2);
expect(geom.components[0].getType()).to.eql(ol.geom.GeometryType.POLYGON);
expect(geom.components[1].getType()).to.eql(ol.geom.GeometryType.POLYGON);
expect(geom.components[0].rings.length).to.eql(1);
expect(geom.components[1].rings.length).to.eql(2);
expect(geom.components[0].rings[0].getCoordinates()).to.eql(
[[40, 40], [20, 45], [45, 30], [40, 40]]);
expect(geom.components[1].rings[0].getCoordinates()).to.eql(
[[20, 35], [45, 20], [30, 5], [10, 10], [10, 30], [20, 35]]);
expect(geom.components[1].rings[1].getCoordinates()).to.eql(
[[30, 20], [20, 25], [20, 15], [30, 20]]);
});
it('GeometryCollection read / written correctly', function() {
@@ -103,6 +148,16 @@ describe('ol.parser.WKT', function() {
expect(geom.components[0].getCoordinates()).to.eql([4, 6]);
expect(geom.components[1].getCoordinates()).to.eql([[4, 6], [7, 10]]);
expect(parser.write(geom)).to.eql(wkt);
// test whitespace when reading
wkt = 'GEOMETRYCOLLECTION ( POINT (4 6), LINESTRING (4 6, 7 10) )';
geom = parser.read(wkt);
expect(geom.components.length).to.eql(2);
expect(geom.getType()).to.eql(ol.geom.GeometryType.GEOMETRYCOLLECTION);
expect(geom.components[0].getType()).to.eql(ol.geom.GeometryType.POINT);
expect(geom.components[1].getType()).to.eql(
ol.geom.GeometryType.LINESTRING);
expect(geom.components[0].getCoordinates()).to.eql([4, 6]);
expect(geom.components[1].getCoordinates()).to.eql([[4, 6], [7, 10]]);
});
});