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

Display the expected preset name for the mismatched geometry issue messages (close #8018)

Browse Source
This commit is contained in:
Quincy Morgan
2020-09-24 08:58:45 -04:00
parent 73a826cefc
commit 9effdf9724
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/util/util.js
View File

@@ -216,13 +216,15 @@ export function utilDisplayType(id) {
}
export function utilDisplayLabel(entity, graph) {
export function utilDisplayLabel(entity, graphOrGeometry) {
var displayName = utilDisplayName(entity);
if (displayName) {
// use the display name if there is one
return displayName;
}
var preset = presetManager.match(entity, graph);
var preset = typeof graphOrGeometry === 'string' ?
presetManager.matchTags(entity.tags, graphOrGeometry) :
presetManager.match(entity, graphOrGeometry);
if (preset && preset.name()) {
// use the preset name if there is a match
return preset.name();

6
modules/validations/mismatched_geometry.js
View File

@@ -88,7 +88,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, context.graph()),
feature: utilDisplayLabel(entity, 'area'),
tag: utilTagText({ tags: tagSuggestingArea })
}) : '';
},
@@ -161,7 +161,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, context.graph())
feature: utilDisplayLabel(entity, 'vertex')
}) : '';
},
reference: function showReference(selection) {
@@ -184,7 +184,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, context.graph())
feature: utilDisplayLabel(entity, 'point')
}) : '';
},
reference: function showReference(selection) {