Add test for route going round loop in other direction

This commit is contained in:
ockendenjo
2018-12-18 22:08:25 +00:00
parent 8aaa387d4e
commit cec442012a

View File

@@ -611,7 +611,7 @@ describe('iD.actionSplit', function () {
//
// Relation: ['-', '#', '~', '#', '=']
//
var hat1 = iD.coreGraph([
var hat1a = iD.coreGraph([
a, b, c, d, e,
iD.osmWay({id: '-', nodes: ['a', 'b']}),
iD.osmWay({id: '#', nodes: ['b', 'c', 'd']}),
@@ -628,6 +628,31 @@ describe('iD.actionSplit', function () {
})
]);
//
// Situation:
// ###> c >###
// # #
// a --> b ~~~~~~> d ==> e
//
// Relation: ['-', '~', '#', '~', '=']
//
var hat1b = iD.coreGraph([
a, b, c, d, e,
iD.osmWay({id: '-', nodes: ['a', 'b']}),
iD.osmWay({id: '#', nodes: ['b', 'c', 'd']}),
iD.osmWay({id: '~', nodes: ['b', 'd']}),
iD.osmWay({id: '=', nodes: ['d', 'e']}),
iD.osmRelation({
id: 'r', members: [
{id: '-', type: 'way'},
{id: '~', type: 'way'},
{id: '#', type: 'way'},
{id: '~', type: 'way'},
{id: '=', type: 'way'}
]
})
]);
//
// Situation:
// ###< c <###
@@ -728,7 +753,7 @@ describe('iD.actionSplit', function () {
})
]);
it('splits hat1 route at c', function () {
it('splits hat1a route at c', function () {
//
// Expected result:
// ###> c >***
@@ -737,7 +762,7 @@ describe('iD.actionSplit', function () {
//
// Relation: ['-', '#', '*', '~', '#', '*', '=']
//
var graph = hat1;
var graph = hat1a;
graph = iD.actionSplit('c', ['*'])(graph);
expect(graph.entity('#').nodes).to.eql(['b', 'c']);
@@ -745,6 +770,23 @@ describe('iD.actionSplit', function () {
expect(members(graph)).to.eql(['-', '#', '*', '~', '#', '*', '=']);
});
it('splits hat1b route at c', function () {
//
// Expected result:
// ###> c >***
// # *
// a --> b ~~~~~~> d ==> e
//
// Relation: ['-', '~', '*', '#', '~', '=']
//
var graph = hat1b;
graph = iD.actionSplit('c', ['*'])(graph);
expect(graph.entity('#').nodes).to.eql(['b', 'c']);
expect(graph.entity('*').nodes).to.eql(['c', 'd']);
expect(members(graph)).to.eql(['-', '~', '*', '#', '~', '=']);
});
it('splits hat2 route at c', function () {
//
// Expected result: