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

Added rte serialization for ol.format.GPX

Browse Source
This commit is contained in:
ahocevar
2014-02-21 16:55:48 +01:00
parent 13b4f07cd9
commit 1354d8ce78
2 changed files with 151 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/gpxformat.js
+141 -63
View File
@@ -423,6 +423,114 @@ ol.format.GPX.prototype.readProjectionFromNode = function(node) {
}; };
/**
* @param {Node} node Node.
* @param {string} value Value for the link's `href` attribute.
* @param {Array.<*>} objectStack Node stack.
* @private
*/
ol.format.GPX.writeLink_ = function(node, value, objectStack) {
node.setAttribute('href', value);
var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context));
var properties = goog.object.get(context, 'properties');
var link = [
goog.object.get(properties, 'linkText'),
goog.object.get(properties, 'linkType')
];
ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */ ({node: node}),
ol.format.GPX.LINK_SERIALIZERS_, ol.xml.OBJECT_PROPERTY_NODE_FACTORY,
link, objectStack, ol.format.GPX.LINK_SEQUENCE_);
};
/**
* @param {Node} node Node.
* @param {ol.Coordinate} coordinate Coordinate.
* @param {Array.<*>} objectStack Object stack.
* @private
* @template T
*/
ol.format.GPX.writeWptType_ = function(node, coordinate, objectStack) {
var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context));
var parentNode = context.node;
goog.asserts.assert(ol.xml.isNode(parentNode));
var namespaceURI = parentNode.namespaceURI;
var properties = goog.object.get(context, 'properties');
//FIXME Projection handling
ol.xml.setAttributeNS(node, null, 'lat', coordinate[1]);
ol.xml.setAttributeNS(node, null, 'lon', coordinate[0]);
var geometryLayout = goog.object.get(context, 'geometryLayout');
switch (geometryLayout) {
case ol.geom.GeometryLayout.XYZM:
if (coordinate[3] !== 0) {
goog.object.set(properties, 'time', coordinate[3]);
}
case ol.geom.GeometryLayout.XYZ:
if (coordinate[2] !== 0) {
goog.object.set(properties, 'ele', coordinate[2]);
}
break;
case ol.geom.GeometryLayout.XYM:
if (coordinate[2] !== 0) {
goog.object.set(properties, 'time', coordinate[2]);
}
}
var orderedKeys = ol.format.GPX.WPT_TYPE_SEQUENCE_[namespaceURI];
var values = ol.xml.makeSequence(properties, orderedKeys);
ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */
({node: node, 'properties': properties}),
ol.format.GPX.WPT_TYPE_SERIALIZERS_, ol.xml.OBJECT_PROPERTY_NODE_FACTORY,
values, objectStack, orderedKeys);
};
/**
* @param {Node} node Node.
* @param {ol.Feature} feature Feature.
* @param {Array.<*>} objectStack Object stack.
* @private
* @template T
*/
ol.format.GPX.writeRte_ = function(node, feature, objectStack) {
var properties = feature.getProperties();
var context = {node: node, 'properties': properties};
var geometry = feature.getGeometry();
if (goog.isDef(geometry)) {
goog.asserts.assertInstanceof(geometry, ol.geom.LineString);
goog.object.set(context, 'geometryLayout', geometry.getLayout());
goog.object.set(properties, 'rtept', geometry.getCoordinates());
}
var parentNode = objectStack[objectStack.length - 1].node;
var orderedKeys = ol.format.GPX.RTE_SEQUENCE_[parentNode.namespaceURI];
var values = ol.xml.makeSequence(properties, orderedKeys);
ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */ (context),
ol.format.GPX.RTE_SERIALIZERS_, ol.xml.OBJECT_PROPERTY_NODE_FACTORY,
values, objectStack, orderedKeys);
};
/**
* @param {Node} node Node.
* @param {ol.Feature} feature Feature.
* @param {Array.<*>} objectStack Object stack.
* @private
* @template T
*/
ol.format.GPX.writeWpt_ = function(node, feature, objectStack) {
var context = objectStack[objectStack.length - 1];
goog.asserts.assert(goog.isObject(context));
goog.object.set(context, 'properties', feature.getProperties());
var geometry = feature.getGeometry();
if (goog.isDef(geometry)) {
goog.asserts.assertInstanceof(geometry, ol.geom.Point);
goog.object.set(context, 'geometryLayout', geometry.getLayout());
ol.format.GPX.writeWptType_(node, geometry.getCoordinates(), objectStack);
}
};
/** /**
* @const * @const
* @type {Array.<string>} * @type {Array.<string>}
@@ -445,23 +553,38 @@ ol.format.GPX.LINK_SERIALIZERS_ = ol.xml.makeStructureNS(
/** /**
* @param {Node} node Node. * @const
* @param {string} value Value for the link's `href` attribute. * @type {Object.<string, Array.<string>>}
* @param {Array.<*>} objectStack Node stack.
* @private * @private
*/ */
ol.format.GPX.writeLink_ = function(node, value, objectStack) { ol.format.GPX.RTE_SEQUENCE_ = ol.xml.makeStructureNS(
node.setAttribute('href', value); ol.format.GPX.NAMESPACE_URIS_, [
var properties = objectStack[objectStack.length - 1].context; 'name', 'cmt', 'desc', 'src', 'link', 'number', 'type', 'rtept'
var link = [ ]);
goog.object.get(properties, 'linkText'),
goog.object.get(properties, 'linkType')
]; /**
ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */ ({node: node}), * @const
ol.format.GPX.LINK_SERIALIZERS_, * @type {Object.<string, Object.<string, ol.xml.Serializer>>}
ol.xml.makeChildNodeFactory(node.namespaceURI), link, objectStack, * @private
ol.format.GPX.LINK_SEQUENCE_); */
}; ol.format.GPX.RTE_SERIALIZERS_ = ol.xml.makeStructureNS(
ol.format.GPX.NAMESPACE_URIS_, {
'name': ol.xml.makeChildAppender(ol.xml.makeSimpleTypeWriter(
ol.format.XSD.writeStringTextNode)),
'cmt': ol.xml.makeChildAppender(ol.xml.makeSimpleTypeWriter(
ol.format.XSD.writeStringTextNode)),
'desc': ol.xml.makeChildAppender(ol.xml.makeSimpleTypeWriter(
ol.format.XSD.writeStringTextNode)),
'src': ol.xml.makeChildAppender(ol.xml.makeSimpleTypeWriter(
ol.format.XSD.writeStringTextNode)),
'link': ol.xml.makeChildAppender(ol.format.GPX.writeLink_),
'number': ol.xml.makeChildAppender(ol.xml.makeSimpleTypeWriter(
ol.format.XSD.writeNonNegativeIntegerTextNode)),
'type': ol.xml.makeChildAppender(ol.xml.makeSimpleTypeWriter(
ol.format.XSD.writeStringTextNode)),
'rtept': ol.xml.makeChildrenAppender(ol.format.GPX.writeWptType_)
});
/** /**
@@ -469,7 +592,7 @@ ol.format.GPX.writeLink_ = function(node, value, objectStack) {
* @type {Object.<string, Array.<string>>} * @type {Object.<string, Array.<string>>}
* @private * @private
*/ */
ol.format.GPX.WPT_SEQUENCE_ = ol.xml.makeStructureNS( ol.format.GPX.WPT_TYPE_SEQUENCE_ = ol.xml.makeStructureNS(
ol.format.GPX.NAMESPACE_URIS_, [ ol.format.GPX.NAMESPACE_URIS_, [
'ele', 'time', 'magvar', 'geoidheight', 'name', 'cmt', 'desc', 'src', 'ele', 'time', 'magvar', 'geoidheight', 'name', 'cmt', 'desc', 'src',
'link', 'sym', 'type', 'fix', 'sat', 'hdop', 'vdop', 'pdop', 'link', 'sym', 'type', 'fix', 'sat', 'hdop', 'vdop', 'pdop',
@@ -481,7 +604,7 @@ ol.format.GPX.WPT_SEQUENCE_ = ol.xml.makeStructureNS(
* @type {Object.<string, Object.<string, ol.xml.Serializer>>} * @type {Object.<string, Object.<string, ol.xml.Serializer>>}
* @private * @private
*/ */
ol.format.GPX.WPT_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.GPX.WPT_TYPE_SERIALIZERS_ = ol.xml.makeStructureNS(
ol.format.GPX.NAMESPACE_URIS_, { ol.format.GPX.NAMESPACE_URIS_, {
'ele': ol.xml.makeChildAppender(ol.xml.makeSimpleTypeWriter( 'ele': ol.xml.makeChildAppender(ol.xml.makeSimpleTypeWriter(
ol.format.XSD.writeDecimalTextNode)), ol.format.XSD.writeDecimalTextNode)),
@@ -553,51 +676,6 @@ ol.format.GPX.GPX_NODE_FACTORY_ = function(feature, objectStack, opt_nodeName) {
}; };
/**
* @param {Node} node Node.
* @param {ol.Feature} feature Feature.
* @param {Array.<*>} objectStack Object stack.
* @private
* @template T
*/
ol.format.GPX.writeWpt_ = function(node, feature, objectStack) {
var parentNode = objectStack[objectStack.length - 1].node;
goog.asserts.assert(ol.xml.isNode(parentNode));
var namespaceURI = parentNode.namespaceURI;
var properties = feature.getProperties();
var geometry = feature.getGeometry();
if (goog.isDef(geometry)) {
goog.asserts.assert(geometry instanceof ol.geom.Point);
var coordinates = geometry.getCoordinates();
//FIXME Projection handling
ol.xml.setAttributeNS(node, null, 'lat', coordinates[1]);
ol.xml.setAttributeNS(node, null, 'lon', coordinates[0]);
var geometryLayout = geometry.getLayout();
switch (geometryLayout) {
case ol.geom.GeometryLayout.XYZM:
if (coordinates[3] !== 0) {
goog.object.set(properties, 'time', coordinates[3]);
}
case ol.geom.GeometryLayout.XYZ:
if (coordinates[2] !== 0) {
goog.object.set(properties, 'ele', coordinates[2]);
}
break;
case ol.geom.GeometryLayout.XYM:
if (coordinates[2] !== 0) {
goog.object.set(properties, 'time', coordinates[2]);
}
}
}
var orderedKeys = ol.format.GPX.WPT_SEQUENCE_[namespaceURI];
var values = ol.xml.makeSequence(properties, orderedKeys);
ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */
({node: node, context: properties}), ol.format.GPX.WPT_SERIALIZERS_,
ol.xml.makeChildNodeFactory(namespaceURI), values, objectStack,
orderedKeys);
};
/** /**
* @const * @const
* @type {Object.<string, Object.<string, ol.xml.Serializer>>} * @type {Object.<string, Object.<string, ol.xml.Serializer>>}
@@ -605,7 +683,7 @@ ol.format.GPX.writeWpt_ = function(node, feature, objectStack) {
*/ */
ol.format.GPX.GPX_SERIALIZERS_ = ol.xml.makeStructureNS( ol.format.GPX.GPX_SERIALIZERS_ = ol.xml.makeStructureNS(
ol.format.GPX.NAMESPACE_URIS_, { ol.format.GPX.NAMESPACE_URIS_, {
//'LineString': ol.xml.makeChildAppender(ol.format.GPX.writeRte_), 'rte': ol.xml.makeChildAppender(ol.format.GPX.writeRte_),
//'MultiLineString': ol.xml.makeChildAppender(ol.format.GPX.writeTrk_), //'MultiLineString': ol.xml.makeChildAppender(ol.format.GPX.writeTrk_),
'wpt': ol.xml.makeChildAppender(ol.format.GPX.writeWpt_) 'wpt': ol.xml.makeChildAppender(ol.format.GPX.writeWpt_)
}); });
test/spec/ol/format/gpxformat.test.js
+10 -2
View File
@@ -12,6 +12,10 @@ describe('ol.format.GPX', function() {
describe('rte', function() { describe('rte', function() {
beforeEach(function() {
format = new ol.format.GPX.V1_1();
});
it('can read an empty rte', function() { it('can read an empty rte', function() {
var text = var text =
'<gpx xmlns="http://www.topografix.com/GPX/1/1">' + '<gpx xmlns="http://www.topografix.com/GPX/1/1">' +
@@ -27,7 +31,7 @@ describe('ol.format.GPX', function() {
expect(g.getLayout()).to.be(ol.geom.GeometryLayout.XYZM); expect(g.getLayout()).to.be(ol.geom.GeometryLayout.XYZM);
}); });
it('can read various rte attributes', function() { it('can read and write various rte attributes', function() {
var text = var text =
'<gpx xmlns="http://www.topografix.com/GPX/1/1">' + '<gpx xmlns="http://www.topografix.com/GPX/1/1">' +
' <rte>' + ' <rte>' +
@@ -56,9 +60,11 @@ describe('ol.format.GPX', function() {
expect(f.get('linkType')).to.be('Link type'); expect(f.get('linkType')).to.be('Link type');
expect(f.get('number')).to.be(1); expect(f.get('number')).to.be(1);
expect(f.get('type')).to.be('Type'); expect(f.get('type')).to.be('Type');
var serialized = format.writeFeatures(fs);
expect(serialized).to.xmleql(ol.xml.load(text));
}); });
it('can read a rte with multiple rtepts', function() { it('can read and write a rte with multiple rtepts', function() {
var text = var text =
'<gpx xmlns="http://www.topografix.com/GPX/1/1">' + '<gpx xmlns="http://www.topografix.com/GPX/1/1">' +
' <rte>' + ' <rte>' +
@@ -74,6 +80,8 @@ describe('ol.format.GPX', function() {
expect(g).to.be.an(ol.geom.LineString); expect(g).to.be.an(ol.geom.LineString);
expect(g.getCoordinates()).to.eql([[2, 1, 0, 0], [4, 3, 0, 0]]); expect(g.getCoordinates()).to.eql([[2, 1, 0, 0], [4, 3, 0, 0]]);
expect(g.getLayout()).to.be(ol.geom.GeometryLayout.XYZM); expect(g.getLayout()).to.be(ol.geom.GeometryLayout.XYZM);
var serialized = format.writeFeatures(fs);
expect(serialized).to.xmleql(ol.xml.load(text));
}); });
}); });