mirror of
https://github.com/FoggedLens/iD.git
synced 2026-02-14 01:33:03 +00:00
Improve test cases for disconnect action to cover shared area nodes..
This commit is contained in:
Bryan Housel
@@ -2,11 +2,10 @@ describe("iD.actions.Disconnect", function () {
|
||||
describe("#disabled", function () {
|
||||
it("returns 'not_connected' for a node shared by less than two ways", function () {
|
||||
var graph = iD.Graph([iD.Node({id: 'a'})]);
|
||||
|
||||
expect(iD.actions.Disconnect('a').disabled(graph)).to.equal('not_connected');
|
||||
});
|
||||
|
||||
it("returns 'not_connected' for a node appearing twice in the same way", function () {
|
||||
it("returns falsy for the closing node in a closed line", function () {
|
||||
// a ---- b
|
||||
// | |
|
||||
// d ---- c
|
||||
@@ -17,9 +16,39 @@ describe("iD.actions.Disconnect", function () {
|
||||
iD.Node({id: 'd'}),
|
||||
iD.Way({id: 'w', nodes: ['a', 'b', 'c', 'd', 'a']})
|
||||
]);
|
||||
expect(iD.actions.Disconnect('a').disabled(graph)).not.to.be.ok;
|
||||
});
|
||||
|
||||
it("returns not_connected for the closing node in a closed area", function () {
|
||||
// a ---- b
|
||||
// | |
|
||||
// d ---- c
|
||||
var graph = iD.Graph([
|
||||
iD.Node({id: 'a'}),
|
||||
iD.Node({id: 'b'}),
|
||||
iD.Node({id: 'c'}),
|
||||
iD.Node({id: 'd'}),
|
||||
iD.Way({id: 'w', nodes: ['a', 'b', 'c', 'd', 'a'], tags: {area: 'yes'}})
|
||||
]);
|
||||
expect(iD.actions.Disconnect('a').disabled(graph)).to.equal('not_connected');
|
||||
});
|
||||
|
||||
it("returns falsy for a shared non-closing node in an area", function () {
|
||||
// a --- b --- c
|
||||
// | |
|
||||
// e --- d
|
||||
var graph = iD.Graph([
|
||||
iD.Node({id: 'a'}),
|
||||
iD.Node({id: 'b'}),
|
||||
iD.Node({id: 'c'}),
|
||||
iD.Node({id: 'd'}),
|
||||
iD.Node({id: 'e'}),
|
||||
iD.Way({id: 'w', nodes: ['a', 'b', 'c', 'd', 'e', 'b', 'a'], tags: {area: 'yes'}})
|
||||
]);
|
||||
|
||||
expect(iD.actions.Disconnect('b').disabled(graph)).not.to.be.ok;
|
||||
});
|
||||
|
||||
it("returns falsy for a node shared by two or more ways", function () {
|
||||
// a ---- b ---- c
|
||||
// |
|
||||
@@ -37,18 +66,21 @@ describe("iD.actions.Disconnect", function () {
|
||||
});
|
||||
|
||||
it("returns falsy for an intersection of two ways with parent way specified", function () {
|
||||
// a ---- b ---- c
|
||||
// |
|
||||
// d
|
||||
var graph = iD.Graph([
|
||||
iD.Node({id: 'a'}),
|
||||
iD.Node({id: 'b'}),
|
||||
iD.Node({id: 'c'}),
|
||||
iD.Node({id: 'd'}),
|
||||
iD.Node({id: '*'}),
|
||||
iD.Way({id: '-', nodes: ['a', '*', 'b']}),
|
||||
iD.Way({id: '|', nodes: ['*', 'd']})
|
||||
iD.Way({id: '-', nodes: ['a', 'b', 'c']}),
|
||||
iD.Way({id: '|', nodes: ['d', 'b']})
|
||||
]);
|
||||
|
||||
expect(iD.actions.Disconnect('*', ['|']).disabled(graph)).not.to.be.ok;
|
||||
expect(iD.actions.Disconnect('b', ['|']).disabled(graph)).not.to.be.ok;
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
it("replaces the node with a new node in all but the first way", function () {
|
||||
@@ -88,9 +120,9 @@ describe("iD.actions.Disconnect", function () {
|
||||
// Disconnect - at b.
|
||||
//
|
||||
// Expected result:
|
||||
// a ---- e b ==== c
|
||||
// |
|
||||
// d
|
||||
// a ---- e b ==== c
|
||||
// |
|
||||
// d
|
||||
//
|
||||
var graph = iD.Graph([
|
||||
iD.Node({id: 'a'}),
|
||||
@@ -109,14 +141,44 @@ describe("iD.actions.Disconnect", function () {
|
||||
expect(graph.entity('|').nodes).to.eql(['d', 'b']);
|
||||
});
|
||||
|
||||
it("replaces later occurrences in a self-intersecting way", function() {
|
||||
// Situtation:
|
||||
// a --- b
|
||||
// \ /
|
||||
// \ /
|
||||
// c
|
||||
// Disconnect at a
|
||||
//
|
||||
// Expected result:
|
||||
// a --- b
|
||||
// |
|
||||
// d --- c
|
||||
//
|
||||
var graph = iD.Graph([
|
||||
iD.Node({id: 'a'}),
|
||||
iD.Node({id: 'b'}),
|
||||
iD.Node({id: 'c'}),
|
||||
iD.Way({id: 'w', nodes: ['a', 'b', 'c', 'a']})
|
||||
]);
|
||||
graph = iD.actions.Disconnect('a', 'd')(graph);
|
||||
expect(graph.entity('w').nodes).to.eql(['a', 'b', 'c', 'd']);
|
||||
});
|
||||
|
||||
it("disconnects a way with multiple intersection points", function() {
|
||||
// Situtation:
|
||||
// a = b - c
|
||||
// | |
|
||||
// e - d
|
||||
// Where b starts/ends -.
|
||||
// a == b -- c
|
||||
// | |
|
||||
// e -- d
|
||||
// 2 ways a-b and b-c-d-e-b
|
||||
//
|
||||
// Disconnect at b
|
||||
|
||||
//
|
||||
// Expected Result:
|
||||
// a == b * -- c
|
||||
// | |
|
||||
// e -- d
|
||||
// 2 ways a-b and *-c-d-e-*
|
||||
//
|
||||
var graph = iD.Graph([
|
||||
iD.Node({id: 'a'}),
|
||||
iD.Node({id: 'b'}),
|
||||
@@ -133,6 +195,99 @@ describe("iD.actions.Disconnect", function () {
|
||||
expect(graph.entity('w2').nodes).to.eql(['*', 'c', 'd', 'e', '*']);
|
||||
});
|
||||
|
||||
it("disconnects a shared non-closing node in an area", function() {
|
||||
// Situtation:
|
||||
// a -- b -- c
|
||||
// | |
|
||||
// e -- d
|
||||
//
|
||||
// Disconnect at b
|
||||
//
|
||||
// Expected Result:
|
||||
// a -- b -- c
|
||||
// | |
|
||||
// * -- e -- d
|
||||
//
|
||||
var graph = iD.Graph([
|
||||
iD.Node({id: 'a'}),
|
||||
iD.Node({id: 'b'}),
|
||||
iD.Node({id: 'c'}),
|
||||
iD.Node({id: 'd'}),
|
||||
iD.Node({id: 'e'}),
|
||||
iD.Way({id: 'w', nodes: ['a', 'b', 'c', 'd', 'e', 'b', 'a'], tags: {area: 'yes'}})
|
||||
]);
|
||||
|
||||
graph = iD.actions.Disconnect('b', '*')(graph);
|
||||
|
||||
expect(graph.entity('w').nodes).to.eql(['a', 'b', 'c', 'd', 'e', '*', 'a']);
|
||||
});
|
||||
|
||||
it("disconnects the closing node of an area without breaking the area", function() {
|
||||
// Situtation:
|
||||
// a --- b --- d
|
||||
// \ / \ /
|
||||
// \ / \ /
|
||||
// c e
|
||||
// 2 areas: a-b-c-a and b-d-e-b
|
||||
//
|
||||
// Disconnect at b
|
||||
//
|
||||
// Expected Result:
|
||||
// a --- b * --- d
|
||||
// \ / \ /
|
||||
// \ / \ /
|
||||
// c e
|
||||
// 2 areas: a-b-c-a and *-d-e-*
|
||||
|
||||
var graph = iD.Graph([
|
||||
iD.Node({id: 'a'}),
|
||||
iD.Node({id: 'b'}),
|
||||
iD.Node({id: 'c'}),
|
||||
iD.Node({id: 'd'}),
|
||||
iD.Node({id: 'e'}),
|
||||
iD.Way({id: 'w1', nodes: ['a', 'b', 'c', 'a'], tags: {area: 'yes'}}),
|
||||
iD.Way({id: 'w2', nodes: ['b', 'd', 'e', 'b'], tags: {area: 'yes'}})
|
||||
]);
|
||||
|
||||
graph = iD.actions.Disconnect('b', '*')(graph);
|
||||
|
||||
expect(graph.entity('w1').nodes).to.eql(['a', 'b', 'c', 'a']);
|
||||
expect(graph.entity('w2').nodes).to.eql(['*', 'd', 'e', '*']);
|
||||
});
|
||||
|
||||
it("disconnects multiple closing nodes of multiple areas without breaking the areas", function() {
|
||||
// Situtation:
|
||||
// a --- b --- d
|
||||
// \ / \ /
|
||||
// \ / \ /
|
||||
// c e
|
||||
// 2 areas: b-c-a-b and b-d-e-b
|
||||
//
|
||||
// Disconnect at b
|
||||
//
|
||||
// Expected Result:
|
||||
// a --- b * --- d
|
||||
// \ / \ /
|
||||
// \ / \ /
|
||||
// c e
|
||||
// 2 areas: b-c-a-b and *-d-e-*
|
||||
|
||||
var graph = iD.Graph([
|
||||
iD.Node({id: 'a'}),
|
||||
iD.Node({id: 'b'}),
|
||||
iD.Node({id: 'c'}),
|
||||
iD.Node({id: 'd'}),
|
||||
iD.Node({id: 'e'}),
|
||||
iD.Way({id: 'w1', nodes: ['b', 'c', 'a', 'b'], tags: {area: 'yes'}}),
|
||||
iD.Way({id: 'w2', nodes: ['b', 'd', 'e', 'b'], tags: {area: 'yes'}})
|
||||
]);
|
||||
|
||||
graph = iD.actions.Disconnect('b', '*')(graph);
|
||||
|
||||
expect(graph.entity('w1').nodes).to.eql(['b', 'c', 'a', 'b']);
|
||||
expect(graph.entity('w2').nodes).to.eql(['*', 'd', 'e', '*']);
|
||||
});
|
||||
|
||||
it("copies location and tags to the new nodes", function () {
|
||||
var tags = {highway: 'traffic_signals'},
|
||||
loc = [1, 2],
|
||||
|
||||
Reference in New Issue
Block a user