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

Check childNode versions too

Browse Source
This commit is contained in:
Bryan Housel
2015-02-27 16:35:58 -05:00
parent 80f5f65f63
commit 1cfc6ad69a
1 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
js/id/modes/save.js
View File

@@ -87,27 +87,44 @@ iD.modes.Save = function(context) {
var local = localGraph.entity(id),
remote = remoteGraph.entity(id);
if (local.version !== remote.version) {
var action = iD.actions.MergeRemoteChanges,
merge = action(id, localGraph, remoteGraph, formatUser),
diff = history.replace(merge);
if (compareVersions(local, remote)) return;
if (diff.length()) return; // merged safely
var action = iD.actions.MergeRemoteChanges,
merge = action(id, localGraph, remoteGraph, formatUser),
diff = history.replace(merge);
var forceLocal = action(id, localGraph, remoteGraph, formatUser).withOption('force_local'),
forceRemote = action(id, localGraph, remoteGraph, formatUser).withOption('force_remote');
if (diff.length()) return; // merged safely
conflicts.push({
id: id,
name: entityName(local),
details: merge.conflicts(),
chosen: 1,
choices: [
choice(id, t('save.conflict.keep_local'), forceLocal),
choice(id, t('save.conflict.keep_remote'), forceRemote)
]
});
var forceLocal = action(id, localGraph, remoteGraph, formatUser).withOption('force_local'),
forceRemote = action(id, localGraph, remoteGraph, formatUser).withOption('force_remote');
conflicts.push({
id: id,
name: entityName(local),
details: merge.conflicts(),
chosen: 1,
choices: [
choice(id, t('save.conflict.keep_local'), forceLocal),
choice(id, t('save.conflict.keep_remote'), forceRemote)
]
});
}
function compareVersions(local, remote) {
if (local.version !== remote.version) return false;
if (local.type === 'way') {
var children = _.union(local.nodes, remote.nodes);
for (var i = 0; i < children.length; i++) {
var a = localGraph.hasEntity(children[i]),
b = remoteGraph.hasEntity(children[i]);
if (!a || !b || a.version !== b.version) return false;
}
}
return true;
}