Skip to content

Commit

Permalink
Fix labelling of new validation to use 'ambiguous' terminology in lie…
Browse files Browse the repository at this point in the history
…u of 'conflicting'.
  • Loading branch information
Bonkles committed Oct 17, 2023
1 parent f301cc3 commit f9ff458
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
6 changes: 3 additions & 3 deletions data/core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1828,10 +1828,10 @@ en:
message: "{feature} ends very close to itself but does not reconnect"
highway-highway:
reference: Intersecting highways should share a junction vertex.
conflicting_crossing_tags:
title: Conflicting Crossing Tags
ambiguous_crossing_tags:
title: Ambiguous Crossing Tags
message: "{feature} crossing info conflicts with {feature2}"
incomplete_message: "{feature2} has crossing info, but one or more of its nodes does not."
incomplete_message: "{feature} has crossing info, but one or more of its nodes does not."
tip: "Crossing way markings conflict with crossing nodes"
reference: Crossing way markings should not conflict with its crossing node.
area_as_point:
Expand Down
10 changes: 4 additions & 6 deletions modules/validations/ambiguous_crossing_tags.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export function validationAmbiguousCrossingTags(context) {
message: function () {
const node = context.hasEntity(this.entityIds[0]);
const way = context.hasEntity(this.entityIds[1]);
return l10n.tHtml('issues.conflicting_crossing_tags.message', {
return l10n.tHtml('issues.ambiguous_crossing_tags.message', {
feature: l10n.displayLabel(node, context.graph()),
feature2: l10n.displayLabel(way, context.graph())
});
Expand Down Expand Up @@ -115,11 +115,9 @@ export function validationAmbiguousCrossingTags(context) {
subtype: 'fixme_tag',
severity: 'warning',
message: function () {
const node = context.hasEntity(this.entityIds[0]);
const way = context.hasEntity(this.entityIds[1]);
return l10n.tHtml('issues.conflicting_crossing_tags.incomplete_message', {
feature: l10n.displayLabel(node, context.graph()),
feature2: l10n.displayLabel(way, context.graph())
return l10n.tHtml('issues.ambiguous_crossing_tags.incomplete_message', {
feature: l10n.displayLabel(way, context.graph())
});
},
reference: showReference,
Expand Down Expand Up @@ -247,7 +245,7 @@ export function validationAmbiguousCrossingTags(context) {
.enter()
.append('div')
.attr('class', 'issue-reference')
.html(l10n.tHtml('issues.conflicting_crossing_tags.reference'));
.html(l10n.tHtml('issues.ambiguous_crossing_tags.reference'));
}

/**
Expand Down

0 comments on commit f9ff458

Please sign in to comment.