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

Merge pull request #3739 from marcjansen/simpler-scientific-wkt

Browse Source 
Simplify detection of scientific notation in WKT format
This commit is contained in:
Marc Jansen
2015-05-31 15:50:50 +02:00
parent e43573bcf2 96741e1f0b
commit 81b13f295b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ol/format/wktformat.js
View File

@@ -495,15 +495,15 @@ ol.format.WKT.Lexer.prototype.readNumber_ = function() {
do {
if (c == '.') {
decimal = true;
} else if (goog.isDef(c) && c.toLowerCase() == 'e') {
} else if (c == 'e' || c == 'E') {
scientificNotation = true;
}
c = this.nextChar_();
} while (
this.isNumeric_(c, decimal) ||
// once c is defined we may have a scientific number indicated by 'e'
// but only if we haven't detected a scientific number before
!scientificNotation && goog.isDef(c) && c.toLowerCase() == 'e' ||
// if we haven't detected a scientific number before, 'e' or 'E'
// hint that we should continue to read
!scientificNotation && (c == 'e' || c == 'E') ||
// once we know that we have a scientific number, both '-' and '+'
// are allowed
scientificNotation && (c == '-' || c == '+')