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

Optionally include ids members of modified relations in extantIDs

Browse Source 
(closes #6273)
This commit is contained in:
Bryan Housel
2019-05-08 13:52:43 -04:00
parent 7e36ed0d93
commit 86c6805cf7
3 changed files with 57 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/core/difference.js
View File

@@ -73,14 +73,30 @@ export function coreDifference(base, head) {
_diff.didChange = _didChange;
_diff.extantIDs = function extantIDs() {
var result = [];
// pass true to include affected relation members
_diff.extantIDs = function extantIDs(includeRelMembers) {
var result = new Set();
Object.keys(_changes).forEach(function(id) {
if (_changes[id].head) {
result.push(id);
result.add(id);
}
var h = _changes[id].head;
var b = _changes[id].base;
var entity = h || b;
if (includeRelMembers && entity.type === 'relation') {
var mh = h ? h.members.map(function(m) { return m.id; }) : [];
var mb = b ? b.members.map(function(m) { return m.id; }) : [];
utilArrayUnion(mh, mb).forEach(function(memberID) {
if (head.hasEntity(memberID)) {
result.add(memberID);
}
});
}
});
return result;
return Array.from(result);
};

10
modules/core/validator.js
View File

@@ -292,8 +292,12 @@ export function coreValidator(context) {
if (entity.type === 'node') { // include parent ways
graph.parentWays(entity).forEach(function(parentWay) {
checkParentRels.push(parentWay);
acc.add(parentWay.id);
checkParentRels.push(parentWay);
});
} else if (entity.type === 'relation') { // include members
entity.members.forEach(function(member) {
acc.add(member.id);
});
}
@@ -356,8 +360,8 @@ export function coreValidator(context) {
}
}
var entityIDs = difference.extantIDs(); // created and modified
difference.deleted().forEach(uncacheEntityID); // deleted
var entityIDs = difference.extantIDs(true); // created/modified (true = w/relation members)
difference.deleted().forEach(uncacheEntityID); // deleted
validator.validateEntities(entityIDs); // dispatches 'validated'
};

30
test/spec/core/difference.js
View File

@@ -118,6 +118,36 @@ describe('iD.coreDifference', function () {
var diff = iD.coreDifference(base, head);
expect(diff.extantIDs()).to.eql([]);
});
it('omits the ids of members of modified relations by default', function () {
var w1 = iD.osmWay({id: 'w1'});
var w2 = iD.osmWay({id: 'w2'});
var r1 = iD.osmRelation({
id: 'r',
tags: { type: 'multipolygon' },
members: [{role: 'outer', id: 'w1', type: 'way'}, {role: '', id: 'w2', type: 'way'}]
});
var r2 = r1.update({ tags: { type: 'multipolygon', landuse: 'residential' }});
var base = iD.coreGraph([r1, w1, w2]);
var head = base.replace(r2);
var diff = iD.coreDifference(base, head);
expect(diff.extantIDs()).to.eql(['r']);
});
it('includes the ids of members of modified relations with option', function () {
var w1 = iD.osmWay({id: 'w1'});
var w2 = iD.osmWay({id: 'w2'});
var r1 = iD.osmRelation({
id: 'r',
tags: { type: 'multipolygon' },
members: [{role: 'outer', id: 'w1', type: 'way'}, {role: '', id: 'w2', type: 'way'}]
});
var r2 = r1.update({ tags: { type: 'multipolygon', landuse: 'residential' }});
var base = iD.coreGraph([r1, w1, w2]);
var head = base.replace(r2);
var diff = iD.coreDifference(base, head);
expect(diff.extantIDs(true)).to.eql(['r', 'w1', 'w2']);
});
});
describe('#created', function () {