Merge pull request #3301 from 1ec5/display-network

Include network in relation display name
This commit is contained in:
Bryan Housel
2016-08-03 15:41:54 -04:00
committed by GitHub

View File

@@ -29,8 +29,16 @@ export function entityOrMemberSelector(ids, graph) {
}
export function displayName(entity) {
var localeName = 'name:' + Detect().locale.toLowerCase().split('-')[0];
return entity.tags[localeName] || entity.tags.name || entity.tags.ref;
var localizedNameKey = 'name:' + Detect().locale.toLowerCase().split('-')[0],
name = entity.tags[localizedNameKey] || entity.tags.name || '',
network = entity.tags.cycle_network || entity.tags.network;
if (!name && entity.tags.ref) {
name = entity.tags.ref;
if (network) {
name = network + ' ' + name;
}
}
return name;
}
export function displayType(id) {