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

After splitting a way, update all matching relation members

Browse Source 
(closes #4140)
This commit is contained in:
Bryan Housel
2017-07-10 18:35:30 -04:00
parent cc95d179a8
commit 01bfc67ea5
2 changed files with 60 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/actions/split.js
View File

@@ -109,7 +109,7 @@ export function actionSplit(nodeId, newWayIds) {
if (relation.isRestriction()) {
var via = relation.memberByRole('via');
if (via && wayB.contains(via.id)) {
relation = relation.updateMember({id: wayB.id}, relation.memberById(wayA.id).index);
relation = relation.replaceMember(wayA, wayB);
graph = graph.replace(relation);
}
} else {

77
test/spec/actions/split.js
View File

@@ -456,17 +456,19 @@ describe('iD.actionSplit', function () {
iD.Way({id: '-', nodes: ['a', 'b', 'c']}),
iD.Way({id: '~', nodes: ['c', 'd']}),
iD.Relation({id: 'r', tags: {type: type}, members: [
{id: '-', role: 'from'},
{id: '~', role: 'to'},
{id: 'c', role: 'via'}]})
{id: '-', role: 'from', type: 'way'},
{id: '~', role: 'to', type: 'way'},
{id: 'c', role: 'via', type: 'node'}
]})
]);
graph = iD.actionSplit('b', ['='])(graph);
expect(graph.entity('r').members).to.eql([
{id: '=', role: 'from'},
{id: '~', role: 'to'},
{id: 'c', role: 'via'}]);
{id: '=', role: 'from', type: 'way'},
{id: '~', role: 'to', type: 'way'},
{id: 'c', role: 'via', type: 'node'}
]);
});
it('updates a restriction\'s \'to\' role', function () {
@@ -488,17 +490,54 @@ describe('iD.actionSplit', function () {
iD.Way({id: '-', nodes: ['a', 'b', 'c']}),
iD.Way({id: '~', nodes: ['c', 'd']}),
iD.Relation({id: 'r', tags: {type: type}, members: [
{id: '~', role: 'from'},
{id: '-', role: 'to'},
{id: 'c', role: 'via'}]})
{id: '~', role: 'from', type: 'way'},
{id: '-', role: 'to', type: 'way'},
{id: 'c', role: 'via', type: 'node'}
]})
]);
graph = iD.actionSplit('b', ['='])(graph);
expect(graph.entity('r').members).to.eql([
{id: '~', role: 'from'},
{id: '=', role: 'to'},
{id: 'c', role: 'via'}]);
{id: '~', role: 'from', type: 'way'},
{id: '=', role: 'to', type: 'way'},
{id: 'c', role: 'via', type: 'node'}
]);
});
it('updates both \'to\' and \'from\' roles for u-turn restrictions', function () {
// Situation:
// a ----> b ----> c ~~~~ d
// A restriction from ---- to ---- via c.
//
// Split at b.
//
// Expected result:
// a ----> b ====> c ~~~~ d
// A restriction from ==== to ==== via c.
//
var graph = iD.Graph([
iD.Node({id: 'a'}),
iD.Node({id: 'b'}),
iD.Node({id: 'c'}),
iD.Node({id: 'd'}),
iD.Way({id: '-', nodes: ['a', 'b', 'c']}),
iD.Way({id: '~', nodes: ['c', 'd']}),
iD.Relation({id: 'r', tags: {type: type}, members: [
{id: '-', role: 'from', type: 'way'},
{id: '-', role: 'to', type: 'way'},
{id: 'c', role: 'via', type: 'node'}
]})
]);
graph = iD.actionSplit('b', ['='])(graph);
expect(graph.entity('r').members).to.eql([
{id: '=', role: 'from', type: 'way'},
{id: '=', role: 'to', type: 'way'},
{id: 'c', role: 'via', type: 'node'}
]);
});
it('leaves unaffected restrictions unchanged', function () {
@@ -520,17 +559,19 @@ describe('iD.actionSplit', function () {
iD.Way({id: '-', nodes: ['c', 'b', 'a']}),
iD.Way({id: '~', nodes: ['c', 'd']}),
iD.Relation({id: 'r', tags: {type: type}, members: [
{id: '-', role: 'from'},
{id: '~', role: 'to'},
{id: 'c', role: 'via'}]})
{id: '-', role: 'from', type: 'way'},
{id: '~', role: 'to', type: 'way'},
{id: 'c', role: 'via', type: 'node'}
]})
]);
graph = iD.actionSplit('b', ['='])(graph);
expect(graph.entity('r').members).to.eql([
{id: '-', role: 'from'},
{id: '~', role: 'to'},
{id: 'c', role: 'via'}]);
{id: '-', role: 'from', type: 'way'},
{id: '~', role: 'to', type: 'way'},
{id: 'c', role: 'via', type: 'node'}
]);
});
});
});