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

Allow connecting to nodes in the turn restriction from outside

Browse Source
This commit is contained in:
Bryan Housel
2018-04-14 23:12:19 -04:00
parent 87841fc403
commit b2df343f2d
2 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
modules/actions/connect.js
View File

@@ -61,7 +61,7 @@ export function actionConnect(nodeIDs) {
var seen = {};
var restrictionIDs = [];
var survivor;
var node;
var node, way;
var relations, relation, role;
var i, j, k;
@@ -116,15 +116,11 @@ export function actionConnect(nodeIDs) {
restrictionIDs = _uniq(restrictionIDs);
for (i = 0; i < restrictionIDs.length; i++) {
relation = graph.entity(restrictionIDs[i]);
if (!relation.isComplete(graph)) continue;
var memberWays = [];
for (j = 0; j < relation.members.length; j++) {
var m = relation.members[j];
var entity = graph.hasEntity(m.id);
if (m.type === 'way') {
memberWays.push(entity);
}
}
var memberWays = relation.members
.filter(function(m) { return m.type === 'way'; })
.map(function(m) { return graph.entity(m.id); });
// 2a. disable if connection would damage a restriction
// (a key node is a node at the junction of ways)
@@ -149,34 +145,56 @@ export function actionConnect(nodeIDs) {
for (j = 0; j < nodeIDs.length; j++) {
var n = nodeIDs[j];
if (nodes.from.indexOf(n) !== -1) { connectFrom = true; }
if (nodes.via.indexOf(n) !== -1) { connectVia = true; }
if (nodes.to.indexOf(n) !== -1) { connectTo = true; }
if (nodes.from.indexOf(n) !== -1) { connectFrom = true; }
if (nodes.via.indexOf(n) !== -1) { connectVia = true; }
if (nodes.to.indexOf(n) !== -1) { connectTo = true; }
if (nodes.keyfrom.indexOf(n) !== -1) { connectKeyFrom = true; }
if (nodes.keyto.indexOf(n) !== -1) { connectKeyTo = true; }
if (nodes.keyto.indexOf(n) !== -1) { connectKeyTo = true; }
}
if (connectFrom && connectTo) { return 'restriction'; }
if (connectFrom && connectTo) { return 'restriction'; }
if (connectFrom && connectVia) { return 'restriction'; }
if (connectTo && connectVia) { return 'restriction'; }
if (connectTo && connectVia) { return 'restriction'; }
// connecting to a key node - must be an adjacent node
// connecting to a key node -
// if both nodes are on a member way (i.e. part of the turn restriction),
// the connecting node must be adjacent to the key node.
if (connectKeyFrom || connectKeyTo) {
if (nodeIDs.length !== 2) { return 'restriction'; }
var ok = false;
var n0 = null;
var n1 = null;
for (j = 0; j < memberWays.length; j++) {
ok = memberWays[j].areAdjacent(nodeIDs[0], nodeIDs[1]);
if (ok) break;
way = memberWays[j];
if (way.contains(nodeIDs[0])) { n0 = nodeIDs[0]; }
if (way.contains(nodeIDs[1])) { n1 = nodeIDs[1]; }
}
if (n0 && n1) { // both nodes are part of the restriction
var ok = false;
for (j = 0; j < memberWays.length; j++) {
way = memberWays[j];
if (way.areAdjacent(n0, n1)) {
ok = true;
break;
}
}
if (!ok) {
return 'restriction';
}
}
if (!ok) { return 'restriction'; }
}
// 2b. disable if nodes being connected will destroy a member way in a restriction
// (to test, make a copy and try removing non surviving nodes)
// (to test, make a copy and try actually connecting the nodes)
for (j = 0; j < memberWays.length; j++) {
var way = memberWays[j].update({});
way = memberWays[j].update({}); // make copy
for (k = 0; k < nodeIDs.length; k++) {
if (nodeIDs[k] !== survivor.id) {
if (nodeIDs[k] === survivor.id) continue;
if (way.areAdjacent(nodeIDs[k], survivor.id)) {
way = way.removeNode(nodeIDs[k]);
} else {
way = way.replaceNode(nodeIDs[k], survivor.id);
}
}
if (way.isDegenerate()) {

28
test/spec/actions/connect.js
View File

@@ -217,6 +217,34 @@ describe('iD.actionConnect', function() {
expect(iD.actionConnect(['b', 'c']).disabled(graph)).to.eql('relation');
});
it('returns falsy when connecting a node unrelated to the restriction', function () {
//
// a --- b d ~~~ e r1: `no_right_turn`
// | FROM '-'
// | VIA 'b'
// c TO '|'
//
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']}),
iD.osmWay({id: '|', nodes: ['b', 'c']}),
iD.osmWay({id: '~', nodes: ['d', 'e']}),
iD.osmRelation({id: 'r1', tags: { type: 'restriction', restriction: 'no_right_turn' }, members: [
{ id: '-', type: 'way', role: 'from' },
{ id: 'b', type: 'node', role: 'via' },
{ id: '|', type: 'way', role: 'to' }
]})
]);
expect(iD.actionConnect(['a', 'd']).disabled(graph)).to.be.not.ok;
expect(iD.actionConnect(['b', 'd']).disabled(graph)).to.be.not.ok;
expect(iD.actionConnect(['c', 'd']).disabled(graph)).to.be.not.ok;
});
it('returns falsy when connecting nodes that would not break a via-node restriction', function () {
//
// a --- b --- c r1: `no_right_turn`