Add option to process GPX extensions nodes

Fixes #1791.
This commit is contained in:
Erik Timmers
2014-07-19 23:58:48 +02:00
parent 8e106a2c98
commit 0309a620ea
2 changed files with 68 additions and 2 deletions
+19
View File
@@ -1244,6 +1244,25 @@ olx.format.GMLOptions.prototype.multiSurface;
olx.format.GMLOptions.prototype.schemaLocation; olx.format.GMLOptions.prototype.schemaLocation;
/**
* @typedef {{readExtensions: (function(ol.Feature, Node)|undefined)}}
* @api
*/
olx.format.GPXOptions;
/**
* Callback function to process `extensions` nodes.
* To prevent memory leaks, this callback function must
* not store any references to the node. Note that the `extensions`
* node is not allowed in GPX 1.0. Moreover, only `extensions`
* nodes from `wpt`, `rte` and `trk` can be processed, as those are
* directly mapped to a feature.
* @type {function(ol.Feature, Node)}
*/
olx.format.GPXOptions.prototype.readExtensions;
/** /**
* @typedef {{featureNS: string, * @typedef {{featureNS: string,
* featureType: string, * featureType: string,
+49 -2
View File
@@ -21,10 +21,20 @@ goog.require('ol.xml');
* *
* @constructor * @constructor
* @extends {ol.format.XMLFeature} * @extends {ol.format.XMLFeature}
* @param {olx.format.GPXOptions=} opt_options Options.
* @api * @api
*/ */
ol.format.GPX = function() { ol.format.GPX = function(opt_options) {
var options = goog.isDef(opt_options) ? opt_options : {};
goog.base(this); goog.base(this);
/**
* @type {function(ol.Feature, Node)|undefined}
* @private
*/
this.readExtensions_ = options.readExtensions;
}; };
goog.inherits(ol.format.GPX, ol.format.XMLFeature); goog.inherits(ol.format.GPX, ol.format.XMLFeature);
@@ -88,6 +98,19 @@ ol.format.GPX.parseLink_ = function(node, objectStack) {
}; };
/**
* @param {Node} node Node.
* @param {Array.<*>} objectStack Object stack.
* @private
*/
ol.format.GPX.parseExtensions_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(node.localName == 'extensions');
var values = /** @type {Object} */ (objectStack[objectStack.length - 1]);
goog.object.set(values, 'extensionsNode_', node);
};
/** /**
* @param {Node} node Node. * @param {Node} node Node.
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
@@ -275,6 +298,7 @@ ol.format.GPX.RTE_PARSERS_ = ol.xml.makeParsersNS(
'link': ol.format.GPX.parseLink_, 'link': ol.format.GPX.parseLink_,
'number': 'number':
ol.xml.makeObjectPropertySetter(ol.format.XSD.readNonNegativeInteger), ol.xml.makeObjectPropertySetter(ol.format.XSD.readNonNegativeInteger),
'extensions': ol.format.GPX.parseExtensions_,
'type': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString), 'type': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString),
'rtept': ol.format.GPX.parseRtePt_ 'rtept': ol.format.GPX.parseRtePt_
}); });
@@ -307,6 +331,7 @@ ol.format.GPX.TRK_PARSERS_ = ol.xml.makeParsersNS(
'number': 'number':
ol.xml.makeObjectPropertySetter(ol.format.XSD.readNonNegativeInteger), ol.xml.makeObjectPropertySetter(ol.format.XSD.readNonNegativeInteger),
'type': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString), 'type': ol.xml.makeObjectPropertySetter(ol.format.XSD.readString),
'extensions': ol.format.GPX.parseExtensions_,
'trkseg': ol.format.GPX.parseTrkSeg_ 'trkseg': ol.format.GPX.parseTrkSeg_
}); });
@@ -361,10 +386,30 @@ ol.format.GPX.WPT_PARSERS_ = ol.xml.makeParsersNS(
'ageofdgpsdata': 'ageofdgpsdata':
ol.xml.makeObjectPropertySetter(ol.format.XSD.readDecimal), ol.xml.makeObjectPropertySetter(ol.format.XSD.readDecimal),
'dgpsid': 'dgpsid':
ol.xml.makeObjectPropertySetter(ol.format.XSD.readNonNegativeInteger) ol.xml.makeObjectPropertySetter(ol.format.XSD.readNonNegativeInteger),
'extensions': ol.format.GPX.parseExtensions_
}); });
/**
* @param {Array.<ol.Feature>} features
* @private
*/
ol.format.GPX.prototype.handleReadExtensions_ = function(features) {
if (goog.isNull(features)) {
features = [];
}
for (var i = 0, ii = features.length; i < ii; ++i) {
var feature = features[i];
if (goog.isDef(this.readExtensions_)) {
var extensionsNode = feature.get('extensionsNode_') || null;
this.readExtensions_(feature, extensionsNode);
}
feature.set('extensionsNode_', undefined);
}
};
/** /**
* Read the first feature from a GPX source. * Read the first feature from a GPX source.
* *
@@ -392,6 +437,7 @@ ol.format.GPX.prototype.readFeatureFromNode = function(node) {
if (!goog.isDef(feature)) { if (!goog.isDef(feature)) {
return null; return null;
} }
this.handleReadExtensions_([feature]);
return feature; return feature;
}; };
@@ -420,6 +466,7 @@ ol.format.GPX.prototype.readFeaturesFromNode = function(node) {
/** @type {Array.<ol.Feature>} */ ([]), ol.format.GPX.GPX_PARSERS_, /** @type {Array.<ol.Feature>} */ ([]), ol.format.GPX.GPX_PARSERS_,
node, []); node, []);
if (goog.isDef(features)) { if (goog.isDef(features)) {
this.handleReadExtensions_(features);
return features; return features;
} else { } else {
return []; return [];