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

Fix straight on restricting with splits

Browse Source
This commit is contained in:
John Firebaugh
2014-05-18 12:08:26 -07:00
parent 6089a6aaea
commit f811c19cdc
2 changed files with 83 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
js/id/actions/restrict_turn.js
View File

@@ -34,28 +34,38 @@ iD.actions.RestrictTurn = function(turn, projection, restrictionId) {
via = graph.entity(turn.via.node),
to = graph.entity(turn.to.way);
if (!from.affix(via.id)) {
var newFromId = turn.from.newID || iD.Way().id;
function split(toOrFrom) {
var newID = toOrFrom.newID || iD.Way().id;
graph = iD.actions.Split(via.id, [newID])
.limitWays([toOrFrom.way])(graph);
graph = iD.actions.Split(via.id, [newFromId])
.limitWays([from.id])(graph);
var a = graph.entity(newID),
b = graph.entity(toOrFrom.way);
var newFrom = graph.entity(newFromId);
if (newFrom.nodes.indexOf(turn.from.node) !== -1)
from = newFrom;
if (a.nodes.indexOf(toOrFrom.node) !== -1) {
return [a, b];
} else {
return [b, a];
}
}
if (turn.from.way === turn.to.way) {
to = from;
} else if (!to.affix(via.id)) {
var newToId = turn.to.newID || iD.Way().id;
if (!from.affix(via.id)) {
if (turn.from.node === turn.to.node) {
// U-turn
from = to = split(turn.from)[0];
} else if (turn.from.way === turn.to.way) {
// Straight-on
var s = split(turn.from);
from = s[0];
to = s[1];
} else {
// Other
from = split(turn.from)[0];
}
}
graph = iD.actions.Split(via.id, [newToId])
.limitWays([to.id])(graph);
var newTo = graph.entity(newToId);
if (newTo.nodes.indexOf(turn.to.node) !== -1)
to = newTo;
if (!to.affix(via.id)) {
to = split(turn.to)[0];
}
return graph.replace(iD.Relation({

56
test/spec/actions/restrict_turn.js
View File

@@ -82,6 +82,62 @@ describe("iD.actions.RestrictTurn", function() {
expect(_.pick(r.memberByRole('to'), 'id', 'type')).to.eql({id: '-', type: 'way'});
});
it('splits the from way when necessary (straight on forward)', function() {
// u====*===>w
// |
// x
var graph = iD.Graph([
iD.Node({id: 'u'}),
iD.Node({id: '*'}),
iD.Node({id: 'w'}),
iD.Node({id: 'x'}),
iD.Way({id: '=', nodes: ['u', '*', 'w']}),
iD.Way({id: '-', nodes: ['*', 'x']})
]),
action = iD.actions.RestrictTurn({
from: {node: 'u', way: '=', newID: '=='},
via: {node: '*'},
to: {node: 'w', way: '='},
restriction: 'no_straight_on'
}, projection, 'r');
graph = action(graph);
var r = graph.entity('r');
expect(r.tags).to.eql({type: 'restriction', restriction: 'no_straight_on'});
expect(_.pick(r.memberByRole('from'), 'id', 'type')).to.eql({id: '=', type: 'way'});
expect(_.pick(r.memberByRole('via'), 'id', 'type')).to.eql({id: '*', type: 'node'});
expect(_.pick(r.memberByRole('to'), 'id', 'type')).to.eql({id: '==', type: 'way'});
});
it('splits the from way when necessary (straight on backward)', function() {
// u<===*====w
// |
// x
var graph = iD.Graph([
iD.Node({id: 'u'}),
iD.Node({id: '*'}),
iD.Node({id: 'w'}),
iD.Node({id: 'x'}),
iD.Way({id: '=', nodes: ['w', '*', 'u']}),
iD.Way({id: '-', nodes: ['*', 'x']})
]),
action = iD.actions.RestrictTurn({
from: {node: 'u', way: '=', newID: '=='},
via: {node: '*'},
to: {node: 'w', way: '='},
restriction: 'no_straight_on'
}, projection, 'r');
graph = action(graph);
var r = graph.entity('r');
expect(r.tags).to.eql({type: 'restriction', restriction: 'no_straight_on'});
expect(_.pick(r.memberByRole('from'), 'id', 'type')).to.eql({id: '==', type: 'way'});
expect(_.pick(r.memberByRole('via'), 'id', 'type')).to.eql({id: '*', type: 'node'});
expect(_.pick(r.memberByRole('to'), 'id', 'type')).to.eql({id: '=', type: 'way'});
});
it('splits the to way when necessary (forward)', function() {
// u====*===>w
// |