Optimize iD.svg.Labels

This commit is contained in:
John Firebaugh
2013-08-26 16:33:03 -07:00
parent f3c6f3eca4
commit 20cf935c46
+14 -9
View File
@@ -263,18 +263,23 @@ iD.svg.Labels = function(projection, context) {
// Split entities into groups specified by label_stack
for (i = 0; i < entities.length; i++) {
entity = entities[i];
var geometry = entity.geometry(graph),
preset = geometry === 'area' && context.presets().match(entity, graph),
var geometry = entity.geometry(graph);
if (geometry === 'vertex')
continue;
if (hidePoints && geometry === 'point')
continue;
var preset = geometry === 'area' && context.presets().match(entity, graph),
icon = preset && !blacklisted(preset) && preset.icon;
if ((iD.util.displayName(entity) || icon) && !(hidePoints && geometry === 'point')) {
if (!icon && !iD.util.displayName(entity))
continue;
for (k = 0; k < label_stack.length; k ++) {
if (entity.geometry(graph) === label_stack[k][0] &&
entity.tags[label_stack[k][1]]) {
labelable[k].push(entity);
break;
}
for (k = 0; k < label_stack.length; k ++) {
if (geometry === label_stack[k][0] && entity.tags[label_stack[k][1]]) {
labelable[k].push(entity);
break;
}
}
}