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

Merge pull request #2741 from bartvde/issue-2741

Browse Source 
issue with reading scientific notation coordinates in ol.format.GML (r=@fredj)
This commit is contained in:
Bart van den Eijnden
2014-09-23 16:17:36 +02:00
parent fb01814384 2e18f077c8
commit b8d8acd3fd
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/format/gmlformat.js
View File

@@ -699,7 +699,7 @@ ol.format.GML.readFlatCoordinatesFromNode_ = function(node, objectStack) {
*/
ol.format.GML.readFlatPos_ = function(node, objectStack) {
var s = ol.xml.getAllTextContent(node, false);
var re = /^\s*([+\-]?\d*\.?\d+(?:e[+\-]?\d+)?)\s*/;
var re = /^\s*([+\-]?\d*\.?\d+(?:[eE][+\-]?\d+)?)\s*/;
/** @type {Array.<number>} */
var flatCoordinates = [];
var m;

19
test/spec/ol/format/gmlformat.test.js
View File

@@ -34,6 +34,25 @@ describe('ol.format.GML', function() {
expect(serialized.firstElementChild).to.xmleql(ol.xml.load(text));
});
it('can read a point geometry with scientific notation', function() {
var text =
'<gml:Point xmlns:gml="http://www.opengis.net/gml" ' +
' srsName="CRS:84">' +
' <gml:pos>1E7 2</gml:pos>' +
'</gml:Point>';
var g = readGeometry(format, text);
expect(g).to.be.an(ol.geom.Point);
expect(g.getCoordinates()).to.eql([10000000, 2, 0]);
text =
'<gml:Point xmlns:gml="http://www.opengis.net/gml" ' +
' srsName="CRS:84">' +
' <gml:pos>1e7 2</gml:pos>' +
'</gml:Point>';
g = readGeometry(format, text);
expect(g).to.be.an(ol.geom.Point);
expect(g.getCoordinates()).to.eql([10000000, 2, 0]);
});
it('can read, transform and write a point geometry', function() {
var config = {
featureProjection: 'EPSG:3857'