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

Add gml:MultiCurve support

Browse Source
This commit is contained in:
Bart van den Eijnden
2014-02-21 14:01:24 +01:00
parent 086828ba14
commit e479bd142f
2 changed files with 116 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,6 +137,28 @@ ol.format.GML.readMultiLineString_ = function(node, objectStack) {
};
/**
* @param {Node} node Node.
* @param {Array.<*>} objectStack Object stack.
* @private
* @return {ol.geom.MultiLineString|undefined} MultiLineString.
*/
ol.format.GML.readMultiCurve_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(node.localName == 'MultiCurve');
var lineStrings = ol.xml.pushParseAndPop(
/** @type {Array.<ol.geom.LineString>} */ ([]),
ol.format.GML.MULTICURVE_PARSERS_, node, objectStack);
if (goog.isDefAndNotNull(lineStrings)) {
var multiLineString = new ol.geom.MultiLineString(null);
multiLineString.setLineStrings(lineStrings);
return multiLineString;
} else {
return undefined;
}
};
/**
* @param {Node} node Node.
* @param {Array.<*>} objectStack Object stack.
@@ -185,6 +207,19 @@ ol.format.GML.lineStringMemberParser_ = function(node, objectStack) {
};
/**
* @param {Node} node Node.
* @param {Array.<*>} objectStack Object stack.
* @private
*/
ol.format.GML.curveMemberParser_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(node.localName == 'curveMember' ||
node.localName == 'curveMembers');
ol.xml.parse(ol.format.GML.CURVEMEMBER_PARSERS_, node, objectStack);
};
/**
* @param {Node} node Node.
* @param {Array.<*>} objectStack Object stack.
@@ -558,6 +593,7 @@ ol.format.GML.GEOMETRY_PARSERS_ = ol.xml.makeParsersNS(
'MultiPolygon': ol.xml.makeArrayPusher(ol.format.GML.readMultiPolygon_),
'Surface': ol.xml.makeArrayPusher(ol.format.GML.readSurface_),
'Curve': ol.xml.makeArrayPusher(ol.format.GML.readCurve_),
'MultiCurve': ol.xml.makeArrayPusher(ol.format.GML.readMultiCurve_),
'Envelope': ol.xml.makeArrayPusher(ol.format.GML.readEnvelope_)
});
@@ -612,6 +648,20 @@ ol.format.GML.MULTILINESTRING_PARSERS_ = ol.xml.makeParsersNS(
});
/**
* @const
* @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private
*/
ol.format.GML.MULTICURVE_PARSERS_ = ol.xml.makeParsersNS(
ol.format.GML.NAMESPACE_URIS_, {
'curveMember': ol.xml.makeArrayPusher(
ol.format.GML.curveMemberParser_),
'curveMembers': ol.xml.makeArrayPusher(
ol.format.GML.curveMemberParser_)
});
/**
* @const
* @type {Object.<string, Object.<string, ol.xml.Parser>>}
@@ -650,6 +700,18 @@ ol.format.GML.LINESTRINGMEMBER_PARSERS_ = ol.xml.makeParsersNS(
});
/**
* @const
* @type {Object.<string, Object.<string, ol.xml.Parser>>}
* @private
*/
ol.format.GML.CURVEMEMBER_PARSERS_ = ol.xml.makeParsersNS(
ol.format.GML.NAMESPACE_URIS_, {
'LineString': ol.xml.makeArrayPusher(ol.format.GML.readLineString_),
'Curve': ol.xml.makeArrayPusher(ol.format.GML.readCurve_)
});
/**
* @const
* @type {Object.<string, Object.<string, ol.xml.Parser>>}

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

@@ -333,6 +333,60 @@ describe('ol.format.GML', function() {
});
describe('multicurve', function() {
it('can read a singular multicurve-linestring geometry', function() {
var text =
'<gml:MultiCurve xmlns:gml="http://www.opengis.net/gml" ' +
' srsName="foo">' +
' <gml:curveMember>' +
' <gml:LineString>' +
' <gml:posList>1 2 2 3</gml:posList>' +
' </gml:LineString>' +
' </gml:curveMember>' +
' <gml:curveMember>' +
' <gml:LineString>' +
' <gml:posList>3 4 4 5</gml:posList>' +
' </gml:LineString>' +
' </gml:curveMember>' +
'</gml:MultiCurve>';
var g = format.readGeometry(text);
expect(g).to.be.an(ol.geom.MultiLineString);
expect(g.getCoordinates()).to.eql(
[[[1, 2, 0], [2, 3, 0]], [[3, 4, 0], [4, 5, 0]]]);
});
it('can read a singular multicurve-curve geometry', function() {
var text =
'<gml:MultiCurve xmlns:gml="http://www.opengis.net/gml" ' +
' srsName="foo">' +
' <gml:curveMember>' +
' <gml:Curve>' +
' <gml:segments>' +
' <gml:LineStringSegment>' +
' <gml:posList>1 2 2 3</gml:posList>' +
' </gml:LineStringSegment>' +
' </gml:segments>' +
' </gml:Curve>' +
' </gml:curveMember>' +
' <gml:curveMember>' +
' <gml:Curve>' +
' <gml:segments>' +
' <gml:LineStringSegment>' +
' <gml:posList>3 4 4 5</gml:posList>' +
' </gml:LineStringSegment>' +
' </gml:segments>' +
' </gml:Curve>' +
' </gml:curveMember>' +
'</gml:MultiCurve>';
var g = format.readGeometry(text);
expect(g).to.be.an(ol.geom.MultiLineString);
expect(g.getCoordinates()).to.eql(
[[[1, 2, 0], [2, 3, 0]], [[3, 4, 0], [4, 5, 0]]]);
});
});
});
});