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

properly load changed entities into altgraph and produce diffs.

Browse Source
This commit is contained in:
Bryan Housel
2014-12-05 11:15:45 -05:00
parent 1c3d198b96
commit 4088f2e70a
4 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/core/graph.js
+1 -4
View File
@@ -16,10 +16,7 @@ iD.Graph = function(other, mutable) {
this.transients = {};
this._childNodes = {};
if (!mutable) {
this.freeze();
}
this.frozen = !mutable;
};
iD.Graph.prototype = {
js/id/core/history.js
+4
View File
@@ -41,6 +41,10 @@ iD.History = function(context) {
return stack[index].graph;
},
base: function() {
return stack[0].graph;
},
merge: function(entities, extent) {
stack[0].graph.rebase(entities, _.pluck(stack, 'graph'), false);
tree.rebase(entities, false);
js/id/id.js
+1 -1
View File
@@ -56,7 +56,7 @@ window.iD = function () {
connection.on('load.context', function loadContext(err, result) {
if (altGraph) {
altGraph.rebase(result.data, [altGraph], false);
_.each(result.data, function(entity) { altGraph.replace(entity); });
} else {
history.merge(result.data, result.extent);
}
js/id/modes/save.js
+27 -14
View File
@@ -8,12 +8,13 @@ iD.modes.Save = function(context) {
}
function save(e) {
var altGraph = iD.Graph(),
var altGraph = iD.Graph(context.history().base(), true),
history = context.history(),
connection = context.connection(),
changes = history.changes(iD.actions.DiscardTags(history.difference())),
toCheck = _.pluck(changes.modified, 'id'),
loading = iD.ui.Loading(context).message(t('save.uploading')).blocking(true),
toCheck = _.pluck(changes.modified, 'id'),
toMerge = [];
errors = [];
context.container()
@@ -21,32 +22,44 @@ iD.modes.Save = function(context) {
// check for version conflicts.. reload modified entities into an alternate graph.
context.altGraph(altGraph);
_.each(toCheck, check);
_.each(toCheck, function(id) {
function check(id) {
connection.loadEntity(id, function(err) {
var version = context.entity(id).version,
altVersion = context.altGraph().entity(id).version;
toCheck = _.without(toCheck, id);
if (version !== altVersion) {
errors.push('Version mismatch for ' + id + ': local=' + version + ', server=' + altVersion);
}
if (err) {
errors.push(err.responseText);
}
else {
var entity = context.graph().entity(id),
altEntity = context.altGraph().entity(id);
if (entity.version !== altEntity.version) {
toMerge.push(id);
errors.push('Version mismatch for ' + id + ': local=' + entity.version + ', server=' + altEntity.version);
}
}
if (!toCheck.length) {
finalize();
}
});
});
}
function merge() {
var diff = context.history().difference(),
altDiff = iD.Difference(context.history().base(), context.altGraph());
// TODO
debugger;
}
function finalize() {
if (toMerge.length) merge();
if (errors.length) {
showErrors(errors);
showErrors();
} else {
connection.putChangeset(
changes,
@@ -55,7 +68,7 @@ iD.modes.Save = function(context) {
function(err, changeset_id) {
if (err) {
errors.push(err.responseText);
showErrors(errors);
showErrors();
} else {
loading.close();
context.flush();
@@ -66,7 +79,7 @@ iD.modes.Save = function(context) {
}
function showErrors(errors) {
function showErrors() {
var confirm = iD.ui.confirm(context.container());
context.altGraph(undefined);