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

Use ol.xml.getLocalName in ol.format.KML

Browse Source
This commit is contained in:
Tom Payne
2014-02-04 17:17:47 +01:00
parent 60fe8efca1
commit 91e9b82fe1
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/kmlformat.js
+11 -9
View File
@@ -1395,8 +1395,8 @@ ol.format.KML.prototype.getExtensions = function() {
*/ */
ol.format.KML.prototype.readDocumentOrFolder_ = function(node, objectStack) { ol.format.KML.prototype.readDocumentOrFolder_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT); goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(node.localName == 'Document' || var localName = ol.xml.getLocalName(node);
node.localName == 'Folder'); goog.asserts.assert(localName == 'Document' || localName == 'Folder');
// FIXME use scope somehow // FIXME use scope somehow
var parsersNS = ol.xml.makeParsersNS( var parsersNS = ol.xml.makeParsersNS(
ol.format.KML.NAMESPACE_URIS_, { ol.format.KML.NAMESPACE_URIS_, {
@@ -1548,21 +1548,22 @@ ol.format.KML.prototype.readFeaturesFromNode = function(node) {
return []; return [];
} }
var features; var features;
if (node.localName == 'Document' || node.localName == 'Folder') { var localName = ol.xml.getLocalName(node);
if (localName == 'Document' || localName == 'Folder') {
features = this.readDocumentOrFolder_(node, []); features = this.readDocumentOrFolder_(node, []);
if (goog.isDef(features)) { if (goog.isDef(features)) {
return features; return features;
} else { } else {
return []; return [];
} }
} else if (node.localName == 'Placemark') { } else if (localName == 'Placemark') {
var feature = this.readPlacemark_(node, []); var feature = this.readPlacemark_(node, []);
if (goog.isDef(feature)) { if (goog.isDef(feature)) {
return [feature]; return [feature];
} else { } else {
return []; return [];
} }
} else if (node.localName == 'kml') { } else if (localName == 'kml') {
features = []; features = [];
var n; var n;
for (n = node.firstElementChild; !goog.isNull(n); for (n = node.firstElementChild; !goog.isNull(n);
@@ -1631,12 +1632,13 @@ ol.format.KML.prototype.readNameFromNode = function(node) {
} }
} }
for (n = node.firstElementChild; !goog.isNull(n); n = n.nextElementSibling) { for (n = node.firstElementChild; !goog.isNull(n); n = n.nextElementSibling) {
var localName = ol.xml.getLocalName(n);
if (goog.array.indexOf(ol.format.KML.NAMESPACE_URIS_, if (goog.array.indexOf(ol.format.KML.NAMESPACE_URIS_,
n.namespaceURI) != -1 && n.namespaceURI) != -1 &&
(n.localName == 'Document' || (localName == 'Document' ||
n.localName == 'Folder' || localName == 'Folder' ||
n.localName == 'Placemark' || localName == 'Placemark' ||
n.localName == 'kml')) { localName == 'kml')) {
var name = this.readNameFromNode(n); var name = this.readNameFromNode(n);
if (goog.isDef(name)) { if (goog.isDef(name)) {
return name; return name;