CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-28 10:51:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Properly split ways which are members of a via way turn restriction

Browse Source 
(closes #4861)
This commit is contained in:
Bryan Housel
2018-03-10 15:20:20 -05:00
parent 15f017f079
commit f8bbb995ac
2 changed files with 197 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/actions/split.js
+143 -10
View File
@@ -903,16 +903,16 @@ describe('iD.actionSplit', function () {
['restriction', 'restriction:bus'].forEach(function (type) {
describe('type = ' + type, function () {
it('updates a restriction\'s \'from\' role', function () {
it('updates a restriction\'s \'from\' role - via node', function () {
// Situation:
// a ----> b ----> c ~~~~ d
// A restriction from ---- to ~~~~ via c.
// A restriction from ---- to ~~~~ via node c.
//
// Split at b.
//
// Expected result:
// a ----> b ====> c ~~~~ d
// A restriction from ==== to ~~~~ via c.
// A restriction from ==== to ~~~~ via node c.
//
var graph = iD.coreGraph([
iD.osmNode({id: 'a'}),
@@ -937,16 +937,16 @@ describe('iD.actionSplit', function () {
]);
});
it('updates a restriction\'s \'to\' role', function () {
it('updates a restriction\'s \'to\' role - via node', function () {
// Situation:
// a ----> b ----> c ~~~~ d
// A restriction from ~~~~ to ---- via c.
// A restriction from ~~~~ to ---- via node c.
//
// Split at b.
//
// Expected result:
// a ----> b ====> c ~~~~ d
// A restriction from ~~~~ to ==== via c.
// A restriction from ~~~~ to ==== via node c.
//
var graph = iD.coreGraph([
iD.osmNode({id: 'a'}),
@@ -971,17 +971,16 @@ describe('iD.actionSplit', function () {
]);
});
it('updates both \'to\' and \'from\' roles for u-turn restrictions', function () {
it('updates both \'to\' and \'from\' roles for via-node u-turn restrictions', function () {
// Situation:
// a ----> b ----> c ~~~~ d
// A restriction from ---- to ---- via c.
// A restriction from ---- to ---- via node c.
//
// Split at b.
//
// Expected result:
// a ----> b ====> c ~~~~ d
// A restriction from ==== to ==== via c.
// A restriction from ==== to ==== via node c.
//
var graph = iD.coreGraph([
iD.osmNode({id: 'a'}),
@@ -1006,6 +1005,140 @@ describe('iD.actionSplit', function () {
]);
});
it('updates a restriction\'s \'from\' role - via way', function () {
// Situation:
// e <~~~~ d
// |
// |
// a ----> b ----> c
//
// A restriction from ---- to ~~~~ via way |
//
// Split at b.
//
// Expected result:
// e <~~~~ d
// |
// |
// a ----> b ====> c
//
// A restriction from ==== to ~~~~ via way |
//
var graph = iD.coreGraph([
iD.osmNode({id: 'a'}),
iD.osmNode({id: 'b'}),
iD.osmNode({id: 'c'}),
iD.osmNode({id: 'd'}),
iD.osmNode({id: 'e'}),
iD.osmWay({id: '-', nodes: ['a', 'b', 'c']}),
iD.osmWay({id: '|', nodes: ['c', 'd']}),
iD.osmWay({id: '~', nodes: ['d', 'e']}),
iD.osmRelation({id: 'r', tags: {type: type}, members: [
{id: '-', role: 'from', type: 'way'},
{id: '~', role: 'to', type: 'way'},
{id: '|', role: 'via', type: 'way'}
]})
]);
graph = iD.actionSplit('b', ['='])(graph);
expect(graph.entity('r').members).to.eql([
{id: '=', role: 'from', type: 'way'},
{id: '~', role: 'to', type: 'way'},
{id: '|', role: 'via', type: 'way'}
]);
});
it('updates a restriction\'s \'to\' role - via way', function () {
// Situation:
// e <~~~~ d
// |
// |
// a ----> b ----> c
//
// A restriction from ~~~~ to ---- via way |
//
// Split at b.
//
// Expected result:
// e <~~~~ d
// |
// |
// a ----> b ====> c
//
// A restriction from ~~~~ to ==== via way |
//
var graph = iD.coreGraph([
iD.osmNode({id: 'a'}),
iD.osmNode({id: 'b'}),
iD.osmNode({id: 'c'}),
iD.osmNode({id: 'd'}),
iD.osmNode({id: 'e'}),
iD.osmWay({id: '-', nodes: ['a', 'b', 'c']}),
iD.osmWay({id: '|', nodes: ['c', 'd']}),
iD.osmWay({id: '~', nodes: ['d', 'e']}),
iD.osmRelation({id: 'r', tags: {type: type}, members: [
{id: '~', role: 'from', type: 'way'},
{id: '-', role: 'to', type: 'way'},
{id: '|', role: 'via', type: 'way'}
]})
]);
graph = iD.actionSplit('b', ['='])(graph);
expect(graph.entity('r').members).to.eql([
{id: '~', role: 'from', type: 'way'},
{id: '=', role: 'to', type: 'way'},
{id: '|', role: 'via', type: 'way'}
]);
});
it('updates a restriction\'s \'via\' role when splitting via way', function () {
// Situation:
// d e
// | ‖
// | ‖
// a ----> b ----> c
//
// A restriction from | to ‖ via way ----
//
// Split at b.
//
// Expected result:
// d e
// | ‖
// | ‖
// a ----> b ====> c
//
// A restriction from | to ‖ via ways ----, ====
//
var graph = iD.coreGraph([
iD.osmNode({id: 'a'}),
iD.osmNode({id: 'b'}),
iD.osmNode({id: 'c'}),
iD.osmNode({id: 'd'}),
iD.osmNode({id: 'e'}),
iD.osmWay({id: '-', nodes: ['a', 'b', 'c']}),
iD.osmWay({id: '|', nodes: ['d', 'a']}),
iD.osmWay({id: '‖', nodes: ['e', 'c']}),
iD.osmRelation({id: 'r', tags: {type: type}, members: [
{id: '|', role: 'from', type: 'way'},
{id: '-', role: 'via', type: 'way'},
{id: '‖', role: 'to', type: 'way'}
]})
]);
graph = iD.actionSplit('b', ['='])(graph);
expect(graph.entity('r').members).to.eql([
{id: '|', role: 'from', type: 'way'},
{id: '-', role: 'via', type: 'way'},
{id: '=', role: 'via', type: 'way'},
{id: '‖', role: 'to', type: 'way'}
]);
});
it('leaves unaffected restrictions unchanged', function () {
// Situation:
// a <---- b <---- c ~~~~ d