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

Use latest entity at time of fix for private_data validation too

Browse Source 
(re: #6407)
This commit is contained in:
Bryan Housel
2019-05-23 19:40:10 -04:00
parent 5440467db0
commit 149a0b43b3
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/validations/private_data.js
+29 -13
View File
@@ -60,32 +60,48 @@ export function validationPrivateData() {
return [new validationIssue({
type: type,
severity: 'warning',
message: function() {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.private_data.contact.message', { feature: utilDisplayLabel(entity, context) }) : '';
},
message: showMessage,
reference: showReference,
entityIds: [entity.id],
data: {
newTags: keepTags
},
fixes: [
new validationIssueFix({
icon: 'iD-operation-delete',
title: t('issues.fix.' + fixID + '.title'),
onClick: function() {
var entityID = this.issue.entityIds[0];
var newTags = this.issue.data.newTags;
context.perform(
actionChangeTags(entityID, newTags),
t('issues.fix.upgrade_tags.annotation')
);
context.perform(doUpgrade, t('issues.fix.upgrade_tags.annotation'));
}
})
]
})];
function doUpgrade(graph) {
var currEntity = context.hasEntity(entity.id);
if (!currEntity) return graph;
var newTags = Object.assign({}, currEntity.tags); // shallow copy
tagDiff.forEach(function(diff) {
if (diff.type === '-') {
delete newTags[diff.key];
} else if (diff.type === '+') {
newTags[diff.key] = diff.newVal;
}
});
return actionChangeTags(currEntity.id, newTags)(graph);
}
function showMessage() {
var currEntity = context.hasEntity(this.entityIds[0]);
if (!currEntity) return '';
return t('issues.private_data.contact.message',
{ feature: utilDisplayLabel(currEntity, context) }
);
}
function showReference(selection) {
var enter = selection.selectAll('.issue-reference')
.data([0])