From a565b72f7da030bbe5ca798a38f1926ec626223b Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 27 Apr 2015 10:18:07 -0400 Subject: [PATCH] Before saving, revert entities where user chose "keep theirs" --- js/id/modes/save.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/js/id/modes/save.js b/js/id/modes/save.js index b66037604..83c471c9b 100644 --- a/js/id/modes/save.js +++ b/js/id/modes/save.js @@ -175,6 +175,20 @@ iD.modes.Save = function(context) { selection.remove(); }) .on('save', function() { + for (var i = 0; i < conflicts.length; i++) { + if (conflicts[i].chosen === 1) { // user chose "keep theirs" + var entity = context.entity(conflicts[i].id); + if (entity.type === 'way') { + var children = _.uniq(entity.nodes); + for (var j = 0; j < children.length; j++) { + var child = context.entity(children[j]); + history.replace(iD.actions.Revert(child)); + } + } + history.replace(iD.actions.Revert(entity)); + } + } + selection.remove(); save(e, true); })