CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-16 22:03:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite tests

Browse Source
This commit is contained in:
John Firebaugh
2013-01-18 11:39:22 -08:00
parent ce6e11a8a0
commit fe8239b81e
2 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/actions/split_way.js
+11 -3
View File
@@ -1,5 +1,13 @@
// https://github.com/systemed/potlatch2/blob/master/net/systemeD/halcyon/connection/actions/SplitWayAction.as
iD.actions.SplitWay = function(nodeId) {
// Split a way at the given node.
//
// For testing convenience, accepts an ID to assign to the new way.
// Normally, this will be undefined and the way will automatically
// be assigned a new ID.
//
// Reference:
// https://github.com/systemed/potlatch2/blob/master/net/systemeD/halcyon/connection/actions/SplitWayAction.as
//
iD.actions.SplitWay = function(nodeId, newWayId) {
return function(graph) {
var node = graph.entity(nodeId),
parents = graph.parentWays(node);
@@ -12,7 +20,7 @@ iD.actions.SplitWay = function(nodeId) {
// Create a 'b' way that contains all of the tags in the second
// half of this way
var newWay = iD.Way({tags: way.tags, nodes: way.nodes.slice(idx)});
var newWay = iD.Way({id: newWayId, tags: way.tags, nodes: way.nodes.slice(idx)});
graph = graph.replace(newWay);
// Reduce the original way to only contain the first set of nodes
test/spec/actions/split_way.js
+41 -46
View File
@@ -8,69 +8,64 @@ describe("iD.actions.SplitWay", function () {
// Expected result:
// a ---- b ==== c
//
var a = iD.Node(),
b = iD.Node(),
c = iD.Node(),
way = iD.Way({nodes: [a.id, b.id, c.id]}),
graph = iD.Graph([a, b, c, way]);
var graph = iD.Graph({
'a': iD.Node({id: 'a'}),
'b': iD.Node({id: 'b'}),
'c': iD.Node({id: 'c'}),
'-': iD.Way({id: '-', nodes: ['a', 'b', 'c']})
});
graph = iD.actions.SplitWay(b.id)(graph);
graph = iD.actions.SplitWay('b', '=')(graph);
var waysA = graph.parentWays(a),
waysB = graph.parentWays(b),
waysC = graph.parentWays(c);
expect(waysA).to.have.length(1);
expect(waysB).to.have.length(2);
expect(waysC).to.have.length(1);
expect(waysA[0]).to.equal(waysB[0]);
expect(waysB[1]).to.equal(waysC[0]);
expect(graph.entity('-').nodes).to.eql(['a', 'b']);
expect(graph.entity('=').nodes).to.eql(['b', 'c']);
});
it("copies tags to the new way", function () {
var a = iD.Node(),
b = iD.Node(),
c = iD.Node(),
tags = {highway: 'residential'},
way = iD.Way({nodes: [a.id, b.id, c.id], tags: tags}),
graph = iD.Graph([a, b, c, way]);
var tags = {highway: 'residential'},
graph = iD.Graph({
'a': iD.Node({id: 'a'}),
'b': iD.Node({id: 'b'}),
'c': iD.Node({id: 'c'}),
'-': iD.Way({id: '-', nodes: ['a', 'b', 'c'], tags: tags})
});
graph = iD.actions.SplitWay(b.id)(graph);
graph = iD.actions.SplitWay('b', '=')(graph);
expect(graph.parentWays(a)[0].tags).to.eql(tags);
expect(graph.parentWays(c)[0].tags).to.eql(tags);
// Immutable tags => should be shared by identity.
expect(graph.entity('-').tags).to.equal(tags);
expect(graph.entity('=').tags).to.equal(tags);
});
it("moves restriction relations to the new way", function () {
// Situation:
// a ==== b ==== c ---- d
// A restriction from ==== to ---- via c.
// a ---- b ---- c ~~~~ d
// A restriction from ---- to ~~~~ via c.
//
// Split at b.
//
// Expected result:
// a ==== b ≠≠≠≠ c ---- d
// A restriction from ≠≠≠≠ to ---- via c.
// a ---- b ==== c ~~~~ d
// A restriction from ==== to ~~~~ via c.
//
var a = iD.Node(),
b = iD.Node(),
c = iD.Node(),
d = iD.Node(),
from = iD.Way({nodes: [a.id, b.id, c.id]}),
to = iD.Way({nodes: [c.id, d.id]}),
restriction = iD.Relation({tags: {type: 'restriction'}, members: [
{ role: 'from', id: from.id },
{ role: 'to', id: to.id },
{ role: 'via', id: c.id }]}),
graph = iD.Graph([a, b, c, d, from, to, restriction]);
var graph = iD.Graph({
'a': iD.Node({id: 'a'}),
'b': iD.Node({id: 'b'}),
'c': iD.Node({id: 'c'}),
'd': iD.Node({id: 'd'}),
'-': iD.Way({id: '-', nodes: ['a', 'b', 'c']}),
'~': iD.Way({id: '~', nodes: ['c', 'd']}),
'r': iD.Relation({tags: {type: 'restriction'}, members: [
{id: '=', role: 'from'},
{id: '~', role: 'to'},
{id: 'c', role: 'via'}]})
});
graph = iD.actions.SplitWay(b.id)(graph);
graph = iD.actions.SplitWay('b', '=')(graph);
restriction = graph.entity(restriction.id);
expect(restriction.members[0]).not.to.eql({ role: 'from', id: from.id });
expect(restriction.members[1]).to.eql({ role: 'to', id: to.id });
expect(restriction.members[2]).to.eql({ role: 'via', id: c.id });
expect(graph.entity('r').members).to.eql([
{id: '=', role: 'from'},
{id: '~', role: 'to'},
{id: 'c', role: 'via'}]);
});
});