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

Load children into remotegraph before conflict checks

Browse Source 
Because loadMultiple doesn't download /full like loadEntity,
need to also load children that aren't already being checked..
This commit is contained in:
Bryan Housel
2015-04-30 13:30:00 -04:00
parent e161c9f2c6
commit bff8266f19
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/modes/save.js
+17
View File
@@ -52,11 +52,28 @@ iD.modes.Save = function(context) {
showErrors();
} else {
var loadMore = [];
_.each(result.data, function(entity) {
remoteGraph.replace(entity);
toLoad = _.without(toLoad, entity.id);
// Because loadMultiple doesn't download /full like loadEntity,
// need to also load children that aren't already being checked..
if (!entity.visible) return;
if (entity.type === 'way') {
loadMore.push.apply(loadMore,
_.difference(entity.nodes, toCheck, toLoad, loadMore));
} else if (entity.type === 'relation' && entity.isMultipolygon()) {
loadMore.push.apply(loadMore,
_.difference(_.pluck(entity.members, 'id'), toCheck, toLoad, loadMore));
}
});
if (loadMore.length) {
toLoad.push.apply(toLoad, loadMore);
context.connection().loadMultiple(loadMore, loaded);
}
if (!toLoad.length) {
checkConflicts();
}