mirror of
https://github.com/FoggedLens/iD.git
synced 2026-02-13 09:12:52 +00:00
11dfbe804c
instead of fully re-sorting the whole relation every time a member is split, perform a local operation: This works under the assumption that the relation is already sorted properly. The new way is inserted into the relation before or after the existing member, depending on how the old/new way connect to their neighboring members. for cases where two ways form a loop, a additional look-ahead is implemented to disambiguate the order
163 lines
7.2 KiB
JavaScript
163 lines
7.2 KiB
JavaScript
describe('iD.actionAddMember', function() {
|
|
it('adds an member to a relation at the specified index', function() {
|
|
var r = iD.osmRelation({members: [{id: '1'}, {id: '3'}]});
|
|
var g = iD.actionAddMember(r.id, {id: '2'}, 1)(iD.coreGraph([r]));
|
|
expect(g.entity(r.id).members).to.eql([{id: '1'}, {id: '2'}, {id: '3'}]);
|
|
});
|
|
|
|
describe('inserts way members at a sensible index', function() {
|
|
function members(graph) {
|
|
return graph.entity('r').members.map(function (m) { return m.id; });
|
|
}
|
|
|
|
it('handles incomplete relations', function () {
|
|
var graph = iD.coreGraph([
|
|
iD.osmNode({id: 'a', loc: [0, 0]}),
|
|
iD.osmNode({id: 'b', loc: [0, 0]}),
|
|
iD.osmNode({id: 'c', loc: [0, 0]}),
|
|
iD.osmNode({id: 'd', loc: [0, 0]}),
|
|
iD.osmWay({id: '-', nodes: ['a', 'b', 'c']}),
|
|
iD.osmWay({id: '=', nodes: ['c','d']}),
|
|
iD.osmRelation({id: 'r', members: [
|
|
{id: '~', type: 'way'},
|
|
{id: '-', type: 'way'}
|
|
]})
|
|
]);
|
|
|
|
graph = iD.actionAddMember('r', {id: '=', type: 'way'})(graph);
|
|
expect(members(graph)).to.eql(['~', '-', '=']);
|
|
});
|
|
|
|
it('adds the member to a relation with no members', function() {
|
|
var graph = iD.coreGraph([
|
|
iD.osmNode({id: 'a', loc: [0, 0]}),
|
|
iD.osmNode({id: 'b', loc: [0, 0]}),
|
|
iD.osmWay({id: '-', nodes: ['a', 'b']}),
|
|
iD.osmRelation({id: 'r'})
|
|
]);
|
|
|
|
graph = iD.actionAddMember('r', {id: '-', type: 'way'})(graph);
|
|
expect(members(graph)).to.eql(['-']);
|
|
});
|
|
|
|
it('appends the member if the ways are not connecting', function() {
|
|
// Before: a ---> b
|
|
// After: a ---> b .. c ===> d
|
|
var graph = iD.coreGraph([
|
|
iD.osmNode({id: 'a', loc: [0, 0]}),
|
|
iD.osmNode({id: 'b', loc: [0, 0]}),
|
|
iD.osmNode({id: 'c', loc: [0, 0]}),
|
|
iD.osmNode({id: 'd', loc: [0, 0]}),
|
|
iD.osmWay({id: '-', nodes: ['a', 'b']}),
|
|
iD.osmWay({id: '=', nodes: ['c', 'd']}),
|
|
iD.osmRelation({id: 'r', members: [
|
|
{id: '-', type: 'way'}
|
|
]})
|
|
]);
|
|
|
|
graph = iD.actionAddMember('r', {id: '=', type: 'way'})(graph);
|
|
expect(members(graph)).to.eql(['-', '=']);
|
|
});
|
|
|
|
it('appends the member if the way connects at end', function() {
|
|
// Before: a ---> b
|
|
// After: a ---> b ===> c
|
|
var graph = iD.coreGraph([
|
|
iD.osmNode({id: 'a', loc: [0, 0]}),
|
|
iD.osmNode({id: 'b', loc: [0, 0]}),
|
|
iD.osmNode({id: 'c', loc: [0, 0]}),
|
|
iD.osmWay({id: '-', nodes: ['a', 'b']}),
|
|
iD.osmWay({id: '=', nodes: ['b', 'c']}),
|
|
iD.osmRelation({id: 'r', members: [
|
|
{id: '-', type: 'way'}
|
|
]})
|
|
]);
|
|
|
|
graph = iD.actionAddMember('r', {id: '=', type: 'way'})(graph);
|
|
expect(members(graph)).to.eql(['-', '=']);
|
|
});
|
|
|
|
it('inserts the member if the way connects at beginning', function() {
|
|
// Before: b ---> c ~~~> d
|
|
// After: a ===> b ---> c ~~~> d
|
|
var graph = iD.coreGraph([
|
|
iD.osmNode({id: 'a', loc: [0, 0]}),
|
|
iD.osmNode({id: 'b', loc: [0, 0]}),
|
|
iD.osmNode({id: 'c', loc: [0, 0]}),
|
|
iD.osmNode({id: 'd', loc: [0, 0]}),
|
|
iD.osmWay({id: '=', nodes: ['a', 'b']}),
|
|
iD.osmWay({id: '-', nodes: ['b', 'c']}),
|
|
iD.osmWay({id: '~', nodes: ['c', 'd']}),
|
|
iD.osmRelation({id: 'r', members: [
|
|
{id: '-', type: 'way'},
|
|
{id: '~', type: 'way'}
|
|
]})
|
|
]);
|
|
|
|
graph = iD.actionAddMember('r', {id: '=', type: 'way'})(graph);
|
|
expect(members(graph)).to.eql(['=', '-', '~']);
|
|
});
|
|
|
|
it('inserts the member if the way connects in middle', function() {
|
|
// Before: a ---> b .. c ~~~> d
|
|
// After: a ---> b ===> c ~~~> d
|
|
var graph = iD.coreGraph([
|
|
iD.osmNode({id: 'a', loc: [0, 0]}),
|
|
iD.osmNode({id: 'b', loc: [0, 0]}),
|
|
iD.osmNode({id: 'c', loc: [0, 0]}),
|
|
iD.osmNode({id: 'd', loc: [0, 0]}),
|
|
iD.osmWay({id: '-', nodes: ['a', 'b']}),
|
|
iD.osmWay({id: '=', nodes: ['b', 'c']}),
|
|
iD.osmWay({id: '~', nodes: ['c', 'd']}),
|
|
iD.osmRelation({id: 'r', members: [
|
|
{id: '-', type: 'way'},
|
|
{id: '~', type: 'way'}
|
|
]})
|
|
]);
|
|
|
|
graph = iD.actionAddMember('r', {id: '=', type: 'way'})(graph);
|
|
expect(members(graph)).to.eql(['-', '=', '~']);
|
|
});
|
|
|
|
it('keeps stops and platforms ordered before node, way, relation (for PTv2 routes)', function() {
|
|
var graph = iD.coreGraph([
|
|
iD.osmNode({id: 'a', loc: [0, 0]}),
|
|
iD.osmNode({id: 'b', loc: [0, 0]}),
|
|
iD.osmNode({id: 'c', loc: [0, 0]}),
|
|
iD.osmWay({id: '-', nodes: ['a', 'b']}),
|
|
iD.osmWay({id: '=', nodes: ['b', 'c']}),
|
|
iD.osmRelation({id: 'r', members: [
|
|
{ id: 'n1', type: 'node', role: 'stop' },
|
|
{ id: 'w1', type: 'way', role: 'platform' },
|
|
{ id: 'n2', type: 'node', role: 'stop_entry_only' },
|
|
{ id: 'w2', type: 'way', role: 'platform_entry_only' },
|
|
{ id: 'n3', type: 'node', role: 'stop_exit_only' },
|
|
{ id: 'w3', type: 'way', role: 'platform_exit_only' },
|
|
{ id: 'n10', type: 'node', role: 'forward' },
|
|
{ id: 'n11', type: 'node', role: 'forward' },
|
|
{ id: '-', type: 'way', role: 'forward' },
|
|
{ id: 'r1', type: 'relation', role: 'forward' },
|
|
{ id: 'n12', type: 'node', role: 'forward' }
|
|
]})
|
|
]);
|
|
|
|
graph = iD.actionAddMember('r', { id: '=', type: 'way', role: 'forward' })(graph);
|
|
expect(graph.entity('r').members).to.eql([
|
|
{ id: 'n1', type: 'node', role: 'stop' },
|
|
{ id: 'w1', type: 'way', role: 'platform' },
|
|
{ id: 'n2', type: 'node', role: 'stop_entry_only' },
|
|
{ id: 'w2', type: 'way', role: 'platform_entry_only' },
|
|
{ id: 'n3', type: 'node', role: 'stop_exit_only' },
|
|
{ id: 'w3', type: 'way', role: 'platform_exit_only' },
|
|
{ id: 'n10', type: 'node', role: 'forward' },
|
|
{ id: 'n11', type: 'node', role: 'forward' },
|
|
{ id: 'n12', type: 'node', role: 'forward' },
|
|
{ id: '-', type: 'way', role: 'forward' },
|
|
{ id: '=', type: 'way', role: 'forward' },
|
|
{ id: 'r1', type: 'relation', role: 'forward' }
|
|
]);
|
|
});
|
|
|
|
});
|
|
});
|