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

Fix WKT geometry type lookup and tests

Browse Source
This commit is contained in:
ahocevar
2018-07-18 15:40:39 +02:00
parent 4adab51768
commit 95533bef66
2 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/ol/format/WKT.js
View File

@@ -83,6 +83,15 @@ const TokenType = {
EOF: 6
};
/**
* @const
* @type {Object.<string, string>}
*/
const WKTGeometryType = {};
for (const type in GeometryType) {
WKTGeometryType[type] = GeometryType[type].toUpperCase();
}
/**
* Class to tokenize a WKT string.
@@ -533,7 +542,7 @@ class Parser {
if (this.match(TokenType.TEXT)) {
const geomType = token.value;
this.layout_ = this.parseGeometryLayout_();
if (geomType == GeometryType.GEOMETRY_COLLECTION.toUpperCase()) {
if (geomType == 'GEOMETRYCOLLECTION') {
const geometries = this.parseGeometryCollectionText_();
return new GeometryCollection(geometries);
} else {
@@ -544,28 +553,28 @@ class Parser {
let coordinates;
switch (geomType) {
case GeometryType.POINT: {
case 'POINT': {
coordinates = this.parsePointText_();
break;
}
case GeometryType.LINESTRING: {
case 'LINESTRING': {
coordinates = this.parseLineStringText_();
break;
}
case GeometryType.POLYGON: {
coordinates = Parser.prototype.parsePolygonText_();
case 'POLYGON': {
coordinates = this.parsePolygonText_();
break;
}
case GeometryType.MULTIPOINT: {
coordinates = Parser.prototype.parseMultiPointText_();
case 'MULTIPOINT': {
coordinates = this.parseMultiPointText_();
break;
}
case GeometryType.MULTILINESTRING: {
coordinates = Parser.prototype.parseMultiLineStringText_();
case 'MULTILINESTRING': {
coordinates = this.parseMultiLineStringText_();
break;
}
case GeometryType.MULTIPOLYGON: {
coordinates = Parser.prototype.parseMultiPolygonText_();
case 'MULTIPOLYGON': {
coordinates = this.parseMultiPolygonText_();
break;
}
default: {
@@ -574,7 +583,7 @@ class Parser {
}
if (!coordinates) {
if (ctor === GeometryConstructor[GeometryType.POINT]) {
if (ctor === GeometryConstructor['POINT']) {
coordinates = [NaN, NaN];
} else {
coordinates = [];

8
test/spec/ol/format/wkt.test.js
View File

@@ -710,8 +710,14 @@ describe('ol.format.WKT', function() {
});
it('Empty geometries read / written correctly', function() {
const wkt = 'POINT EMPTY';
const geom = format.readGeometry(wkt);
const coordinates = geom.getCoordinates();
expect(coordinates.length).to.be(2);
expect(isNaN(coordinates[0])).to.be(true);
expect(isNaN(coordinates[1])).to.be(true);
const wkts = [
'POINT', 'LINESTRING', 'POLYGON', 'MULTIPOINT', 'MULTILINESTRING', 'MULTIPOLYGON'
'LINESTRING', 'POLYGON', 'MULTIPOINT', 'MULTILINESTRING', 'MULTIPOLYGON'
];
for (let i = 0, ii = wkts.length; i < ii; ++i) {
const wkt = wkts[i] + ' EMPTY';