From 794e953d43bd9b279ab09b608697a9cf36b41381 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 19 Feb 2019 08:40:49 -0500 Subject: [PATCH] Don't suggest continuing a disconnected highway from endpoints that have noexit=yes --- modules/validations/disconnected_way.js | 42 ++++++++++++++----------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/modules/validations/disconnected_way.js b/modules/validations/disconnected_way.js index 55645960f..2c43aa92f 100644 --- a/modules/validations/disconnected_way.js +++ b/modules/validations/disconnected_way.js @@ -37,24 +37,30 @@ export function validationDisconnectedWay() { var fixes = []; if (!entity.isClosed()) { - fixes.push(new validationIssueFix({ - icon: 'iD-operation-continue-left', - title: t('issues.fix.continue_from_start.title'), - entityIds: [entity.first()], - onClick: function() { - var vertex = context.entity(entity.first()); - continueDrawing(entity, vertex, context); - } - })); - fixes.push(new validationIssueFix({ - icon: 'iD-operation-continue', - title: t('issues.fix.continue_from_end.title'), - entityIds: [entity.last()], - onClick: function() { - var vertex = context.entity(entity.last()); - continueDrawing(entity, vertex, context); - } - })); + var first = context.entity(entity.first()); + if (first.tags.noexit !== 'yes') { + fixes.push(new validationIssueFix({ + icon: 'iD-operation-continue-left', + title: t('issues.fix.continue_from_start.title'), + entityIds: [entity.first()], + onClick: function() { + var vertex = context.entity(entity.first()); + continueDrawing(entity, vertex, context); + } + })); + } + var last = context.entity(entity.last()); + if (last.tags.noexit !== 'yes') { + fixes.push(new validationIssueFix({ + icon: 'iD-operation-continue', + title: t('issues.fix.continue_from_end.title'), + entityIds: [entity.last()], + onClick: function() { + var vertex = context.entity(entity.last()); + continueDrawing(entity, vertex, context); + } + })); + } } fixes.push(new validationIssueFix({