CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-24 17:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make iD.actions.Join agnostic to selection order

Browse Source 
This is accomplished by reusing iD.geo.joinMemberWays,
which was refactored, generalized, and renamed to joinWays.
This commit is contained in:
John Firebaugh
2013-06-18 12:19:53 -07:00
parent ac70b68e35
commit ddd9e4e8cc
7 changed files with 112 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/actions/join.js
+20
View File
@@ -52,6 +52,26 @@ describe("iD.actions.Join", function () {
expect(iD.actions.Join(['-', '=']).disabled(graph)).not.to.be.ok;
});
it("returns falsy for more than two ways when connected, regardless of order", function () {
// a --> b ==> c ~~> d
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']}),
'=': iD.Way({id: '=', nodes: ['b', 'c']}),
'~': iD.Way({id: '~', nodes: ['c', 'd']})
});
expect(iD.actions.Join(['-', '=', '~']).disabled(graph)).not.to.be.ok;
expect(iD.actions.Join(['-', '~', '=']).disabled(graph)).not.to.be.ok;
expect(iD.actions.Join(['=', '-', '~']).disabled(graph)).not.to.be.ok;
expect(iD.actions.Join(['=', '~', '-']).disabled(graph)).not.to.be.ok;
expect(iD.actions.Join(['~', '=', '-']).disabled(graph)).not.to.be.ok;
expect(iD.actions.Join(['~', '-', '=']).disabled(graph)).not.to.be.ok;
});
it("returns 'not_eligible' for non-line geometries", function () {
var graph = iD.Graph({
'a': iD.Node({id: 'a'})
test/spec/geo/multipolygon.js
+25 -8
View File
@@ -40,17 +40,17 @@ describe("iD.geo.simpleMultipolygonOuterMember", function() {
});
});
describe("iD.geo.joinMemberWays", function() {
it("returns an array of members with locs properties", function() {
describe("iD.geo.joinWays", function() {
it("returns an array of members with nodes properties", function() {
var node = iD.Node({loc: [0, 0]}),
way = iD.Way({nodes: [node.id]}),
member = {id: way.id, type: 'way'},
graph = iD.Graph([node, way]),
result = iD.geo.joinMemberWays([member], graph);
result = iD.geo.joinWays([member], graph);
expect(result.length).to.equal(1);
expect(result[0].locs.length).to.equal(1);
expect(result[0].locs[0]).to.equal(node.loc);
expect(result[0].nodes.length).to.equal(1);
expect(result[0].nodes[0]).to.equal(node);
expect(result[0].length).to.equal(1);
expect(result[0][0]).to.equal(member);
});
@@ -72,20 +72,37 @@ describe("iD.geo.joinMemberWays", function() {
]})
});
var result = iD.geo.joinMemberWays(graph.entity('r').members, graph);
var result = iD.geo.joinWays(graph.entity('r').members, graph);
expect(_.pluck(result[0], 'id')).to.eql(['=', '-', '~']);
});
it("reverses member tags of reversed segements", function() {
// a --> b <== c
// Expected result:
// a --> b --> c
// tags on === reversed
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']}),
'=': iD.Way({id: '=', nodes: ['c', 'b'], tags: {'lanes:forward': 2}})
});
var result = iD.geo.joinWays([graph.entity('-'), graph.entity('=')], graph);
expect(result[0][1].tags).to.eql({'lanes:backward': 2});
});
it("ignores non-way members", function() {
var node = iD.Node({loc: [0, 0]}),
member = {id: 'n', type: 'node'},
graph = iD.Graph([node]);
expect(iD.geo.joinMemberWays([member], graph)).to.eql([]);
expect(iD.geo.joinWays([member], graph)).to.eql([]);
});
it("ignores incomplete members", function() {
var member = {id: 'w', type: 'way'},
graph = iD.Graph();
expect(iD.geo.joinMemberWays([member], graph)).to.eql([]);
expect(iD.geo.joinWays([member], graph)).to.eql([]);
});
});