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

Correct axis order for gml:pos

Browse Source
This commit is contained in:
Bart van den Eijnden
2014-02-26 17:37:16 +01:00
parent 37a78dc753
commit 5240929a53
2 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -694,7 +694,7 @@ ol.format.GML.readFlatPosList_ = function(node, objectStack) {
x = parseFloat(coords[i]);
y = parseFloat(coords[i + 1]);
z = (dim === 3) ? parseFloat(coords[i + 2]) : 0;
if (axisOrientation === 'enu') {
if (axisOrientation.substr(0, 2) === 'en') {
flatCoordinates.push(x, y, z);
} else {
flatCoordinates.push(y, x, z);
@@ -994,10 +994,22 @@ ol.format.GML.prototype.readFeaturesFromNode = function(node) {
* @private
*/
ol.format.GML.writePos_ = function(node, value, objectStack) {
var layout = value.getLayout();
node.setAttribute('srsDimension',
(layout == ol.geom.GeometryLayout.XYZ) ? '3' : '2');
ol.format.XSD.writeStringTextNode(node, value.getCoordinates().join(' '));
var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context));
var srsName = goog.object.get(context, 'srsName');
var axisOrientation = 'enu';
if (goog.isDefAndNotNull(srsName)) {
axisOrientation = ol.proj.get(srsName).getAxisOrientation();
}
var point = value.getCoordinates();
var coords;
// only 2d for simple features profile
if (axisOrientation.substr(0, 2) === 'en') {
coords = (point[0] + ' ' + point[1]);
} else {
coords = (point[1] + ' ' + point[0]);
}
ol.format.XSD.writeStringTextNode(node, coords);
};
@@ -1022,7 +1034,7 @@ ol.format.GML.writePosList_ = function(node, value, objectStack) {
var point;
for (var i = 0; i < len; ++i) {
point = points[i];
if (axisOrientation === 'enu') {
if (axisOrientation.substr(0, 2) === 'en') {
parts[i] = point[0] + ' ' + point[1];
} else {
parts[i] = point[1] + ' ' + point[0];
@@ -1079,7 +1091,8 @@ ol.format.GML.writePoint_ = function(node, geometry, objectStack) {
if (goog.isDefAndNotNull(srsName)) {
node.setAttribute('srsName', srsName);
}
ol.xml.pushSerializeAndPop({node: node},
var context = {node: node, srsName: srsName};
ol.xml.pushSerializeAndPop(context,
ol.format.GML.FLAT_COORDINATES_SERIALIZERS_,
ol.format.GML.POS_NODE_FACTORY_, [geometry], []);
};

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

@@ -23,7 +23,7 @@ describe('ol.format.GML', function() {
var text =
'<gml:Point xmlns:gml="http://www.opengis.net/gml" ' +
' srsName="CRS:84">' +
' <gml:pos srsDimension="3">1 2 0</gml:pos>' +
' <gml:pos>1 2</gml:pos>' +
'</gml:Point>';
var g = readGeometry(format, text);
expect(g).to.be.an(ol.geom.Point);
@@ -70,16 +70,22 @@ describe('ol.format.GML', function() {
expect(serialized.firstElementChild).to.xmleql(ol.xml.load(text));
});
it('can read a point geometry with correct axis order', function() {
var text =
'<gml:Point xmlns:gml="http://www.opengis.net/gml" ' +
' srsName="urn:x-ogc:def:crs:EPSG:4326">' +
' <gml:pos>-90 -180</gml:pos>' +
'</gml:Point>';
var g = readGeometry(format, text);
expect(g).to.be.an(ol.geom.Point);
expect(g.getCoordinates()).to.eql([-180, -90, 0]);
});
it('can read and write a point geometry with correct axis order',
function() {
var text =
'<gml:Point xmlns:gml="http://www.opengis.net/gml" ' +
' srsName="urn:x-ogc:def:crs:EPSG:4326">' +
' <gml:pos>-90 -180</gml:pos>' +
'</gml:Point>';
format = new ol.format.GML({
srsName: 'urn:x-ogc:def:crs:EPSG:4326'
});
var g = readGeometry(format, text);
expect(g).to.be.an(ol.geom.Point);
expect(g.getCoordinates()).to.eql([-180, -90, 0]);
var serialized = format.writeGeometry(g);
expect(serialized.firstElementChild).to.xmleql(ol.xml.load(text));
});
it('can read multi surface geometry with right axis order', function() {
var text =