CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-15 13:38:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Take a graph parameter in utilDisplayLabel instead of the context

Browse Source
This commit is contained in:
Quincy Morgan
2020-04-01 13:29:17 -07:00
parent 90b1395df4
commit 0120b009fa
16 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/behavior/hash.js
+1 -1
View File
@@ -58,7 +58,7 @@ export function behaviorHash(context) {
return context.hasEntity(id);
});
if (selected.length) {
var firstLabel = utilDisplayLabel(context.entity(selected[0]), context);
var firstLabel = utilDisplayLabel(context.entity(selected[0]), context.graph());
if (selected.length > 1 ) {
contextual = t('title.labeled_and_more', {
labeled: firstLabel,
modules/util/util.js
+2 -2
View File
@@ -201,13 +201,13 @@ export function utilDisplayType(id) {
}
export function utilDisplayLabel(entity, context) {
export function utilDisplayLabel(entity, graph) {
var displayName = utilDisplayName(entity);
if (displayName) {
// use the display name if there is one
return displayName;
}
var preset = presetManager.match(entity, context.graph());
var preset = presetManager.match(entity, graph);
if (preset && preset.name()) {
// use the preset name if there is a match
return preset.name();
modules/validations/almost_junction.js
+3 -3
View File
@@ -56,13 +56,13 @@ export function validationAlmostJunction(context) {
const entity1 = context.hasEntity(this.entityIds[0]);
if (this.entityIds[0] === this.entityIds[2]) {
return entity1 ? t('issues.almost_junction.self.message', {
feature: utilDisplayLabel(entity1, context)
feature: utilDisplayLabel(entity1, context.graph())
}) : '';
} else {
const entity2 = context.hasEntity(this.entityIds[2]);
return (entity1 && entity2) ? t('issues.almost_junction.message', {
feature: utilDisplayLabel(entity1, context),
feature2: utilDisplayLabel(entity2, context)
feature: utilDisplayLabel(entity1, context.graph()),
feature2: utilDisplayLabel(entity2, context.graph())
}) : '';
}
},
modules/validations/close_nodes.js
+3 -3
View File
@@ -169,8 +169,8 @@ export function validationCloseNodes(context) {
var entity = context.hasEntity(this.entityIds[0]),
entity2 = context.hasEntity(this.entityIds[1]);
return (entity && entity2) ? t('issues.close_nodes.detached.message', {
feature: utilDisplayLabel(entity, context),
feature2: utilDisplayLabel(entity2, context)
feature: utilDisplayLabel(entity, context.graph()),
feature2: utilDisplayLabel(entity2, context.graph())
}) : '';
},
reference: showReference,
@@ -233,7 +233,7 @@ export function validationCloseNodes(context) {
severity: 'warning',
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.close_nodes.message', { way: utilDisplayLabel(entity, context) }) : '';
return entity ? t('issues.close_nodes.message', { way: utilDisplayLabel(entity, context.graph()) }) : '';
},
reference: showReference,
entityIds: [way.id, node1.id, node2.id],
modules/validations/crossing_ways.js
+3 -3
View File
@@ -333,7 +333,7 @@ export function validationCrossingWays(context) {
var type1 = way1Info.featureType;
var type2 = way2Info.featureType;
if (type1 === type2) {
return utilDisplayLabel(way1Info.way, context) > utilDisplayLabel(way2Info.way, context);
return utilDisplayLabel(way1Info.way, context.graph()) > utilDisplayLabel(way2Info.way, context.graph());
} else if (type1 === 'waterway') {
return true;
} else if (type2 === 'waterway') {
@@ -381,8 +381,8 @@ export function validationCrossingWays(context) {
var entity1 = context.hasEntity(this.entityIds[0]),
entity2 = context.hasEntity(this.entityIds[1]);
return (entity1 && entity2) ? t('issues.crossing_ways.message', {
feature: utilDisplayLabel(entity1, context),
feature2: utilDisplayLabel(entity2, context)
feature: utilDisplayLabel(entity1, context.graph()),
feature2: utilDisplayLabel(entity2, context.graph())
}) : '';
},
reference: showReference,
modules/validations/disconnected_way.js
+1 -1
View File
@@ -25,7 +25,7 @@ export function validationDisconnectedWay() {
message: function(context) {
if (this.entityIds.length === 1) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.disconnected_way.highway.message', { highway: utilDisplayLabel(entity, context) }) : '';
return entity ? t('issues.disconnected_way.highway.message', { highway: utilDisplayLabel(entity, context.graph()) }) : '';
}
return t('issues.disconnected_way.routable.message.multiple', { count: this.entityIds.length.toString() });
},
modules/validations/help_request.js
+1 -1
View File
@@ -25,7 +25,7 @@ export function validationHelpRequest(context) {
severity: 'warning',
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.fixme_tag.message', { feature: utilDisplayLabel(entity, context) }) : '';
return entity ? t('issues.fixme_tag.message', { feature: utilDisplayLabel(entity, context.graph()) }) : '';
},
dynamicFixes: function() {
return [
modules/validations/impossible_oneway.js
+1 -1
View File
@@ -164,7 +164,7 @@ export function validationImpossibleOneway() {
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.impossible_oneway.' + messageID + '.message', {
feature: utilDisplayLabel(entity, context)
feature: utilDisplayLabel(entity, context.graph())
}) : '';
},
reference: getReference(referenceID),
modules/validations/incompatible_source.js
+1 -1
View File
@@ -35,7 +35,7 @@ export function validationIncompatibleSource() {
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.incompatible_source.' + invalidSource.id + '.feature.message', {
feature: utilDisplayLabel(entity, context)
feature: utilDisplayLabel(entity, context.graph())
}) : '';
},
reference: getReference(invalidSource.id),
modules/validations/invalid_format.js
+2 -2
View File
@@ -56,7 +56,7 @@ export function validationFormatting() {
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.invalid_format.website.message' + this.data,
{ feature: utilDisplayLabel(entity, context), site: websites.join(', ') }) : '';
{ feature: utilDisplayLabel(entity, context.graph()), site: websites.join(', ') }) : '';
},
reference: showReferenceWebsite,
entityIds: [entity.id],
@@ -81,7 +81,7 @@ export function validationFormatting() {
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.invalid_format.email.message' + this.data,
{ feature: utilDisplayLabel(entity, context), email: emails.join(', ') }) : '';
{ feature: utilDisplayLabel(entity, context.graph()), email: emails.join(', ') }) : '';
},
reference: showReferenceEmail,
entityIds: [entity.id],
modules/validations/mismatched_geometry.js
+4 -4
View File
@@ -88,7 +88,7 @@ export function validationMismatchedGeometry() {
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.tag_suggests_area.message', {
feature: utilDisplayLabel(entity, context),
feature: utilDisplayLabel(entity, context.graph()),
tag: utilTagText({ tags: tagSuggestingArea })
}) : '';
},
@@ -161,7 +161,7 @@ export function validationMismatchedGeometry() {
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.vertex_as_point.message', {
feature: utilDisplayLabel(entity, context)
feature: utilDisplayLabel(entity, context.graph())
}) : '';
},
reference: function showReference(selection) {
@@ -184,7 +184,7 @@ export function validationMismatchedGeometry() {
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.point_as_vertex.message', {
feature: utilDisplayLabel(entity, context)
feature: utilDisplayLabel(entity, context.graph())
}) : '';
},
reference: function showReference(selection) {
@@ -260,7 +260,7 @@ export function validationMismatchedGeometry() {
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.unclosed_multipolygon_part.message', {
feature: utilDisplayLabel(entity, context)
feature: utilDisplayLabel(entity, context.graph())
}) : '';
},
reference: showReference,
modules/validations/missing_role.js
+2 -2
View File
@@ -45,8 +45,8 @@ export function validationMissingRole() {
var member = context.hasEntity(this.entityIds[1]),
relation = context.hasEntity(this.entityIds[0]);
return (member && relation) ? t('issues.missing_role.message', {
member: utilDisplayLabel(member, context),
relation: utilDisplayLabel(relation, context)
member: utilDisplayLabel(member, context.graph()),
relation: utilDisplayLabel(relation, context.graph())
}) : '';
},
reference: showReference,
modules/validations/missing_tag.js
+1 -1
View File
@@ -85,7 +85,7 @@ export function validationMissingTag(context) {
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.' + messageID + '.message', {
feature: utilDisplayLabel(entity, context)
feature: utilDisplayLabel(entity, context.graph())
}) : '';
},
reference: showReference,
modules/validations/outdated_tags.js
+2 -2
View File
@@ -215,7 +215,7 @@ export function validationOutdatedTags() {
if (subtype === 'noncanonical_brand' && isOnlyAddingTags) {
messageID += '_incomplete';
}
return t(messageID, { feature: utilDisplayLabel(currEntity, context) });
return t(messageID, { feature: utilDisplayLabel(currEntity, context.graph()) });
}
@@ -302,7 +302,7 @@ export function validationOutdatedTags() {
if (!currMultipolygon) return '';
return t('issues.old_multipolygon.message',
{ multipolygon: utilDisplayLabel(currMultipolygon, context) }
{ multipolygon: utilDisplayLabel(currMultipolygon, context.graph()) }
);
}
modules/validations/private_data.js
+1 -1
View File
@@ -99,7 +99,7 @@ export function validationPrivateData() {
if (!currEntity) return '';
return t('issues.private_data.contact.message',
{ feature: utilDisplayLabel(currEntity, context) }
{ feature: utilDisplayLabel(currEntity, context.graph()) }
);
}
modules/validations/unsquare_way.js
+1 -1
View File
@@ -76,7 +76,7 @@ export function validationUnsquareWay(context) {
severity: 'warning',
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.unsquare_way.message', { feature: utilDisplayLabel(entity, context) }) : '';
return entity ? t('issues.unsquare_way.message', { feature: utilDisplayLabel(entity, context.graph()) }) : '';
},
reference: showReference,
entityIds: [entity.id],