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

Adjust verbose utilDisplayLabel call, use for more validation messages

Browse Source 
(re: https://github.com/osmlab/name-suggestion-index/issues/4543#issuecomment-794527259)
This commit is contained in:
Bryan Housel
2021-03-10 10:30:57 -05:00
parent 2b7adf89fa
commit 9f30ebf551
6 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/util/util.js
+1 -1
View File
@@ -229,7 +229,7 @@ export function utilDisplayLabel(entity, graphOrGeometry, verbose) {
var preset = typeof graphOrGeometry === 'string' ?
presetManager.matchTags(entity.tags, graphOrGeometry) :
presetManager.match(entity, graphOrGeometry);
var presetName = preset && preset.name();
var presetName = preset && (preset.suggestion ? preset.subtitle() : preset.name());
if (verbose) {
result = [presetName, displayName].filter(Boolean).join(' ');
modules/validations/help_request.js
+3 -1
View File
@@ -25,7 +25,9 @@ export function validationHelpRequest(context) {
severity: 'warning',
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.fixme_tag.message', { feature: utilDisplayLabel(entity, context.graph()) }) : '';
return entity ? t.html('issues.fixme_tag.message', {
feature: utilDisplayLabel(entity, context.graph(), true /* verbose */)
}) : '';
},
dynamicFixes: function() {
return [
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.html('issues.incompatible_source.' + invalidSource.id + '.feature.message', {
feature: utilDisplayLabel(entity, context.graph())
feature: utilDisplayLabel(entity, context.graph(), true /* verbose */)
}) : '';
},
reference: getReference(invalidSource.id),
modules/validations/mismatched_geometry.js
+5 -5
View File
@@ -89,7 +89,7 @@ export function validationMismatchedGeometry() {
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.tag_suggests_area.message', {
feature: utilDisplayLabel(entity, 'area'),
feature: utilDisplayLabel(entity, 'area', true /* verbose */),
tag: utilTagText({ tags: tagSuggestingArea })
}) : '';
},
@@ -162,7 +162,7 @@ export function validationMismatchedGeometry() {
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.vertex_as_point.message', {
feature: utilDisplayLabel(entity, 'vertex')
feature: utilDisplayLabel(entity, 'vertex', true /* verbose */)
}) : '';
},
reference: function showReference(selection) {
@@ -185,7 +185,7 @@ export function validationMismatchedGeometry() {
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.point_as_vertex.message', {
feature: utilDisplayLabel(entity, 'point')
feature: utilDisplayLabel(entity, 'point', true /* verbose */)
}) : '';
},
reference: function showReference(selection) {
@@ -264,7 +264,7 @@ export function validationMismatchedGeometry() {
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.' + referenceId + '.message', {
feature: utilDisplayLabel(entity, targetGeom)
feature: utilDisplayLabel(entity, targetGeom, true /* verbose */)
}) : '';
},
reference: function showReference(selection) {
@@ -371,7 +371,7 @@ export function validationMismatchedGeometry() {
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.unclosed_multipolygon_part.message', {
feature: utilDisplayLabel(entity, context.graph())
feature: utilDisplayLabel(entity, context.graph(), true /* verbose */)
}) : '';
},
reference: showReference,
modules/validations/outdated_tags.js
+1 -1
View File
@@ -235,7 +235,7 @@ export function validationOutdatedTags() {
if (!currMultipolygon) return '';
return t.html('issues.old_multipolygon.message',
{ multipolygon: utilDisplayLabel(currMultipolygon, context.graph()) }
{ multipolygon: utilDisplayLabel(currMultipolygon, context.graph(), true /* verbose */) }
);
}
modules/validations/unsquare_way.js
+3 -1
View File
@@ -76,7 +76,9 @@ export function validationUnsquareWay(context) {
severity: 'warning',
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.unsquare_way.message', { feature: utilDisplayLabel(entity, context.graph()) }) : '';
return entity ? t.html('issues.unsquare_way.message', {
feature: utilDisplayLabel(entity, context.graph())
}) : '';
},
reference: showReference,
entityIds: [entity.id],