diff --git a/js/iD/Util.js b/js/iD/Util.js index 88c221198..9382bc6c0 100644 --- a/js/iD/Util.js +++ b/js/iD/Util.js @@ -12,16 +12,21 @@ iD.Util.friendlyName = function(entity) { // summary: Rough-and-ready function to return a human-friendly name // for the object. Really just a placeholder for something better. // returns: A string such as 'river' or 'Fred's House'. - if (_.isEmpty(entity.tags)) { return ''; } + if (!Object.keys(entity.tags).length) { return ''; } var mainkeys = ['highway','amenity','railway','waterway']; - var n = _.compact([entity.tags.name, entity.tags.ref]); + var n = []; + + if (entity.tags.name) n.push(entity.tags.name); + if (entity.tags.ref) n.push(entity.tags.ref); if (!n.length) { - var k = _.find(mainkeys, function(m) { - return !!entity.tags[m]; - }); - if (k) n.push(entity.tags[k]); + for (var k in entity.tags) { + if (mainkeys[k]) { + n.push(entity.tags[k]); + break; + } + } } return n.length === 0 ? 'unknown' : n.join('; ');