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

Fire change events for multi-part geometries

Browse Source
This commit is contained in:
ahocevar
2013-10-04 23:36:16 -06:00
parent 703564fcbb
commit 52552c9b18
19 changed files with 253 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/parser/geojson.test.js
+4 -4
View File
@@ -101,10 +101,10 @@ describe('ol.parser.GeoJSON', function() {
]);
var geojson = parser.write(collection);
var got = parser.read(geojson);
expect(collection.components.length).to.equal(got.length);
for (var i = 0, ii = collection.components.length; i < ii; ++i) {
expect(collection.components[i].getCoordinates()).to.eql(
got[i].getCoordinates());
var components = collection.getComponents();
expect(components.length).to.equal(got.length);
for (var i = 0, ii = components.length; i < ii; ++i) {
expect(components[i].getCoordinates()).to.eql(got[i].getCoordinates());
}
});
test/spec/ol/parser/kml.test.js
+8 -6
View File
@@ -118,10 +118,11 @@ describe('ol.parser.KML', function() {
afterLoadXml(url, function(xml) {
var obj = parser.read(xml);
var geom = obj.features[0].getGeometry();
var components = geom.getComponents();
expect(geom instanceof ol.geom.GeometryCollection).to.be.ok();
expect(geom.components.length).to.eql(2);
expect(geom.components[0] instanceof ol.geom.LineString).to.be.ok();
expect(geom.components[1] instanceof ol.geom.Point).to.be.ok();
expect(components.length).to.eql(2);
expect(components[0] instanceof ol.geom.LineString).to.be.ok();
expect(components[1] instanceof ol.geom.Point).to.be.ok();
done();
});
});
@@ -346,9 +347,10 @@ describe('ol.parser.KML', function() {
expect(alaska).to.be.a(ol.Feature);
var geometry = alaska.getGeometry();
expect(geometry).to.be.a(ol.geom.GeometryCollection);
expect(geometry.components).to.have.length(2);
expect(geometry.components[0]).to.be.a(ol.geom.Point);
expect(geometry.components[1]).to.be.a(ol.geom.MultiPolygon);
var components = geometry.getComponents();
expect(components).to.have.length(2);
expect(components[0]).to.be.a(ol.geom.Point);
expect(components[1]).to.be.a(ol.geom.MultiPolygon);
});
});
test/spec/ol/parser/wkt.test.js
+50 -44
View File
@@ -19,20 +19,22 @@ describe('ol.parser.WKT', function() {
// there are two forms to test
var wkt = 'MULTIPOINT((10 40),(40 30),(20 20),(30 10))';
var geom = parser.read(wkt);
expect(geom.components.length).to.eql(4);
expect(geom.components[0].getCoordinates()).to.eql([10, 40]);
expect(geom.components[1].getCoordinates()).to.eql([40, 30]);
expect(geom.components[2].getCoordinates()).to.eql([20, 20]);
expect(geom.components[3].getCoordinates()).to.eql([30, 10]);
var components = geom.getComponents();
expect(components.length).to.eql(4);
expect(components[0].getCoordinates()).to.eql([10, 40]);
expect(components[1].getCoordinates()).to.eql([40, 30]);
expect(components[2].getCoordinates()).to.eql([20, 20]);
expect(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);
expect(geom.components[0].getCoordinates()).to.eql([10, 40]);
expect(geom.components[1].getCoordinates()).to.eql([40, 30]);
expect(geom.components[2].getCoordinates()).to.eql([20, 20]);
expect(geom.components[3].getCoordinates()).to.eql([30, 10]);
components = geom.getComponents();
expect(components.length).to.eql(4);
expect(components[0].getCoordinates()).to.eql([10, 40]);
expect(components[1].getCoordinates()).to.eql([40, 30]);
expect(components[2].getCoordinates()).to.eql([20, 20]);
expect(components[3].getCoordinates()).to.eql([30, 10]);
});
it('LineString read / written correctly', function() {
@@ -53,10 +55,10 @@ describe('ol.parser.WKT', function() {
'(40 40,30 30,40 20,30 10))';
var 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(
var components = geom.getComponents();
expect(components.length).to.eql(2);
expect(components[0].getType()).to.eql(ol.geom.GeometryType.LINESTRING);
expect(components[0].getCoordinates()).to.eql(
[[10, 10], [20, 20], [10, 40]]);
expect(parser.write(geom)).to.eql(wkt);
// test whitespace when reading
@@ -64,10 +66,11 @@ describe('ol.parser.WKT', function() {
'(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(
components = geom.getComponents();
expect(components.length).to.eql(2);
expect(components[0].getType()).to.eql(
ol.geom.GeometryType.LINESTRING);
expect(geom.components[0].getCoordinates()).to.eql(
expect(components[0].getCoordinates()).to.eql(
[[10, 10], [20, 20], [10, 40]]);
});
@@ -113,16 +116,17 @@ describe('ol.parser.WKT', function() {
'((20 35,45 20,30 5,10 10,10 30,20 35),(30 20,20 25,20 15,30 20)))';
var 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].getRings().length).to.eql(1);
expect(geom.components[1].getRings().length).to.eql(2);
expect(geom.components[0].getRings()[0].getCoordinates()).to.eql(
var components = geom.getComponents();
expect(components.length).to.eql(2);
expect(components[0].getType()).to.eql(ol.geom.GeometryType.POLYGON);
expect(components[1].getType()).to.eql(ol.geom.GeometryType.POLYGON);
expect(components[0].getRings().length).to.eql(1);
expect(components[1].getRings().length).to.eql(2);
expect(components[0].getRings()[0].getCoordinates()).to.eql(
[[40, 40], [45, 30], [20, 45], [40, 40]]);
expect(geom.components[1].getRings()[0].getCoordinates()).to.eql(
expect(components[1].getRings()[0].getCoordinates()).to.eql(
[[20, 35], [45, 20], [30, 5], [10, 10], [10, 30], [20, 35]]);
expect(geom.components[1].getRings()[1].getCoordinates()).to.eql(
expect(components[1].getRings()[1].getCoordinates()).to.eql(
[[30, 20], [20, 25], [20, 15], [30, 20]]);
expect(parser.write(geom)).to.eql(wkt);
@@ -132,40 +136,42 @@ describe('ol.parser.WKT', function() {
'( 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].getRings().length).to.eql(1);
expect(geom.components[1].getRings().length).to.eql(2);
expect(geom.components[0].getRings()[0].getCoordinates()).to.eql(
var components = geom.getComponents();
expect(components.length).to.eql(2);
expect(components[0].getType()).to.eql(ol.geom.GeometryType.POLYGON);
expect(components[1].getType()).to.eql(ol.geom.GeometryType.POLYGON);
expect(components[0].getRings().length).to.eql(1);
expect(components[1].getRings().length).to.eql(2);
expect(components[0].getRings()[0].getCoordinates()).to.eql(
[[40, 40], [45, 30], [20, 45], [40, 40]]);
expect(geom.components[1].getRings()[0].getCoordinates()).to.eql(
expect(components[1].getRings()[0].getCoordinates()).to.eql(
[[20, 35], [45, 20], [30, 5], [10, 10], [10, 30], [20, 35]]);
expect(geom.components[1].getRings()[1].getCoordinates()).to.eql(
expect(components[1].getRings()[1].getCoordinates()).to.eql(
[[30, 20], [20, 25], [20, 15], [30, 20]]);
});
it('GeometryCollection read / written correctly', function() {
var wkt = 'GEOMETRYCOLLECTION(POINT(4 6),LINESTRING(4 6,7 10))';
var geom = parser.read(wkt);
expect(geom.components.length).to.eql(2);
var components = geom.getComponents();
expect(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]]);
expect(components[0].getType()).to.eql(ol.geom.GeometryType.POINT);
expect(components[1].getType()).to.eql(ol.geom.GeometryType.LINESTRING);
expect(components[0].getCoordinates()).to.eql([4, 6]);
expect(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);
components = geom.getComponents();
expect(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(
expect(components[0].getType()).to.eql(ol.geom.GeometryType.POINT);
expect(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]]);
expect(components[0].getCoordinates()).to.eql([4, 6]);
expect(components[1].getCoordinates()).to.eql([[4, 6], [7, 10]]);
});
});