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

Fetch missing childnodes when restoring from localstorage

Browse Source 
(see #2142)
TODO: fetch older version if the node has been deleted.
This commit is contained in:
Bryan Housel
2015-06-18 09:56:11 -04:00
parent 4c3ebbec2b
commit 8398fd7cf1
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
js/id/core/history.js
View File

@@ -242,7 +242,7 @@ iD.History = function(context) {
}); });
}, },
fromJSON: function(json) { fromJSON: function(json, loadChildNodes) {
var h = JSON.parse(json); var h = JSON.parse(json);
iD.Entity.id.next = h.nextIDs; iD.Entity.id.next = h.nextIDs;
@@ -256,7 +256,7 @@ iD.History = function(context) {
}); });
if (h.version === 3) { if (h.version === 3) {
// this merges originals for changed entities into the base of // This merges originals for changed entities into the base of
// the stack even if the current stack doesn't have them (for // the stack even if the current stack doesn't have them (for
// example when iD has been restarted in a different region) // example when iD has been restarted in a different region)
var baseEntities = h.baseEntities.map(function(entity) { var baseEntities = h.baseEntities.map(function(entity) {
@@ -264,6 +264,33 @@ iD.History = function(context) {
}); });
stack[0].graph.rebase(baseEntities, _.pluck(stack, 'graph'), true); stack[0].graph.rebase(baseEntities, _.pluck(stack, 'graph'), true);
tree.rebase(baseEntities, true); tree.rebase(baseEntities, true);
// When we restore a modified way, we also need to fetch any missing
// childnodes that would normally have been downloaded with it.. #2142
if (loadChildNodes) {
var missing = _(baseEntities)
.filter('type', 'way')
.pluck('nodes')
.flatten()
.uniq()
.reject(function(n) { return stack[0].graph.hasEntity(n); })
.value();
if (!_.isEmpty(missing)) {
context.connection().loadMultiple(missing, function(err, result) {
if (err) return;
var visible = _.groupBy(result.data, 'visible');
if (!_.isEmpty(visible.true)) {
stack[0].graph.rebase(visible.true, _.pluck(stack, 'graph'), false);
tree.rebase(visible.true, false);
}
// if (!_.isEmpty(visible.false)) {
// todo: something here!
// }
});
}
}
} }
stack = h.stack.map(function(d) { stack = h.stack.map(function(d) {
@@ -336,7 +363,7 @@ iD.History = function(context) {
if (!lock.locked()) return; if (!lock.locked()) return;
var json = context.storage(getKey('saved_history')); var json = context.storage(getKey('saved_history'));
if (json) history.fromJSON(json); if (json) history.fromJSON(json, true);
}, },
_getKey: getKey _getKey: getKey

4
js/id/ui/intro.js
View File

@@ -18,7 +18,7 @@ iD.ui.intro = function(context) {
// Load semi-real data used in intro // Load semi-real data used in intro
context.connection().toggle(false).flush(); context.connection().toggle(false).flush();
context.history().reset(); context.history().reset();
introGraph = JSON.parse(iD.introGraph); introGraph = JSON.parse(iD.introGraph);
for (var key in introGraph) { for (var key in introGraph) {
introGraph[key] = iD.Entity(introGraph[key]); introGraph[key] = iD.Entity(introGraph[key]);
@@ -61,7 +61,7 @@ iD.ui.intro = function(context) {
context.connection().toggle(true).flush().loadedTiles(loadedTiles); context.connection().toggle(true).flush().loadedTiles(loadedTiles);
context.history().reset().merge(d3.values(baseEntities)); context.history().reset().merge(d3.values(baseEntities));
context.background().baseLayerSource(background); context.background().baseLayerSource(background);
if (history) context.history().fromJSON(history); if (history) context.history().fromJSON(history, false);
window.location.replace(hash); window.location.replace(hash);
context.inIntro(false); context.inIntro(false);
d3.select('#bar button.save').on('click', save); d3.select('#bar button.save').on('click', save);