Fix nodeValue deprecation warnings

This commit is contained in:
John Firebaugh
2014-07-20 16:04:54 -07:00
parent 82c09ab454
commit 4994566f57
+17 -17
View File
@@ -72,7 +72,7 @@ iD.Connection = function() {
var elems = obj.getElementsByTagName(ndStr),
nodes = new Array(elems.length);
for (var i = 0, l = elems.length; i < l; i++) {
nodes[i] = 'n' + elems[i].attributes.ref.nodeValue;
nodes[i] = 'n' + elems[i].attributes.ref.value;
}
return nodes;
}
@@ -82,7 +82,7 @@ iD.Connection = function() {
tags = {};
for (var i = 0, l = elems.length; i < l; i++) {
var attrs = elems[i].attributes;
tags[attrs.k.nodeValue] = attrs.v.nodeValue;
tags[attrs.k.value] = attrs.v.value;
}
return tags;
}
@@ -93,9 +93,9 @@ iD.Connection = function() {
for (var i = 0, l = elems.length; i < l; i++) {
var attrs = elems[i].attributes;
members[i] = {
id: attrs.type.nodeValue[0] + attrs.ref.nodeValue,
type: attrs.type.nodeValue,
role: attrs.role.nodeValue
id: attrs.type.value[0] + attrs.ref.value,
type: attrs.type.value,
role: attrs.role.value
};
}
return members;
@@ -105,10 +105,10 @@ iD.Connection = function() {
node: function nodeData(obj) {
var attrs = obj.attributes;
return new iD.Node({
id: iD.Entity.id.fromOSM(nodeStr, attrs.id.nodeValue),
loc: [parseFloat(attrs.lon.nodeValue), parseFloat(attrs.lat.nodeValue)],
version: attrs.version.nodeValue,
user: attrs.user && attrs.user.nodeValue,
id: iD.Entity.id.fromOSM(nodeStr, attrs.id.value),
loc: [parseFloat(attrs.lon.value), parseFloat(attrs.lat.value)],
version: attrs.version.value,
user: attrs.user && attrs.user.value,
tags: getTags(obj)
});
},
@@ -116,9 +116,9 @@ iD.Connection = function() {
way: function wayData(obj) {
var attrs = obj.attributes;
return new iD.Way({
id: iD.Entity.id.fromOSM(wayStr, attrs.id.nodeValue),
version: attrs.version.nodeValue,
user: attrs.user && attrs.user.nodeValue,
id: iD.Entity.id.fromOSM(wayStr, attrs.id.value),
version: attrs.version.value,
user: attrs.user && attrs.user.value,
tags: getTags(obj),
nodes: getNodes(obj)
});
@@ -127,9 +127,9 @@ iD.Connection = function() {
relation: function relationData(obj) {
var attrs = obj.attributes;
return new iD.Relation({
id: iD.Entity.id.fromOSM(relationStr, attrs.id.nodeValue),
version: attrs.version.nodeValue,
user: attrs.user && attrs.user.nodeValue,
id: iD.Entity.id.fromOSM(relationStr, attrs.id.value),
version: attrs.version.value,
user: attrs.user && attrs.user.value,
tags: getTags(obj),
members: getMembers(obj)
});
@@ -263,9 +263,9 @@ iD.Connection = function() {
}
userDetails = {
display_name: u.attributes.display_name.nodeValue,
display_name: u.attributes.display_name.value,
image_url: image_url,
id: u.attributes.id.nodeValue
id: u.attributes.id.value
};
callback(undefined, userDetails);