From 9f30ebf5513c5eee81e411d435389a680bc05bd4 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 10 Mar 2021 10:30:57 -0500 Subject: [PATCH] Adjust verbose utilDisplayLabel call, use for more validation messages (re: https://github.com/osmlab/name-suggestion-index/issues/4543#issuecomment-794527259) --- modules/util/util.js | 2 +- modules/validations/help_request.js | 4 +++- modules/validations/incompatible_source.js | 2 +- modules/validations/mismatched_geometry.js | 10 +++++----- modules/validations/outdated_tags.js | 2 +- modules/validations/unsquare_way.js | 4 +++- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/modules/util/util.js b/modules/util/util.js index f7d9c71c0..055fe7ad4 100644 --- a/modules/util/util.js +++ b/modules/util/util.js @@ -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(' '); diff --git a/modules/validations/help_request.js b/modules/validations/help_request.js index e9842d37b..5750b353d 100644 --- a/modules/validations/help_request.js +++ b/modules/validations/help_request.js @@ -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 [ diff --git a/modules/validations/incompatible_source.js b/modules/validations/incompatible_source.js index 916628492..ed2041dde 100644 --- a/modules/validations/incompatible_source.js +++ b/modules/validations/incompatible_source.js @@ -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), diff --git a/modules/validations/mismatched_geometry.js b/modules/validations/mismatched_geometry.js index 303c34dae..199cf238e 100644 --- a/modules/validations/mismatched_geometry.js +++ b/modules/validations/mismatched_geometry.js @@ -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, diff --git a/modules/validations/outdated_tags.js b/modules/validations/outdated_tags.js index 079f345fd..2116cc262 100644 --- a/modules/validations/outdated_tags.js +++ b/modules/validations/outdated_tags.js @@ -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 */) } ); } diff --git a/modules/validations/unsquare_way.js b/modules/validations/unsquare_way.js index cd837e21d..bc8744344 100644 --- a/modules/validations/unsquare_way.js +++ b/modules/validations/unsquare_way.js @@ -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],