CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-23 08:39:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add straighten way operation and action

Browse Source
This commit is contained in:
Paul Mach
2013-09-19 13:01:08 -07:00
parent 8eaf5afafb
commit b8efb00cfc
6 changed files with 164 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/index.html
+3
View File
@@ -128,6 +128,7 @@
<script src='../js/id/actions/rotate_way.js'></script>
<script src='../js/id/actions/circularize.js'></script>
<script src='../js/id/actions/orthogonalize.js'></script>
<script src='../js/id/actions/straighten.js'></script>
<script src='../js/id/actions/noop.js'></script>
<script src='../js/id/actions/reverse.js'></script>
<script src='../js/id/actions/split.js'></script>
@@ -160,6 +161,7 @@
<script src='../js/id/operations/continue.js'></script>
<script src='../js/id/operations/circularize.js'></script>
<script src='../js/id/operations/orthogonalize.js'></script>
<script src='../js/id/operations/straighten.js'></script>
<script src='../js/id/operations/delete.js'></script>
<script src='../js/id/operations/disconnect.js'></script>
<script src='../js/id/operations/merge.js'></script>
@@ -203,6 +205,7 @@
<script src="spec/actions/change_tags.js"></script>
<script src='spec/actions/circularize.js'></script>
<script src='spec/actions/orthogonalize.js'></script>
<script src='spec/actions/straighten.js'></script>
<script src='spec/actions/connect.js'></script>
<script src='spec/actions/delete_member.js'></script>
<script src="spec/actions/delete_multiple.js"></script>
test/spec/actions/straighten.js
+44
View File
@@ -0,0 +1,44 @@
describe("iD.actions.Straighten", function () {
var projection = d3.geo.mercator();
it("deletes empty nodes", function() {
var graph = iD.Graph({
'a': iD.Node({id: 'a', loc: [0, 0]}),
'b': iD.Node({id: 'b', loc: [2, 0], tags: {}}),
'c': iD.Node({id: 'c', loc: [2, 2]}),
'-': iD.Way({id: '-', nodes: ['a', 'b', 'c']})
});
graph = iD.actions.Straighten('-', projection)(graph);
expect(graph.hasEntity('b')).to.be.undefined;
});
it("does not delete tagged nodes", function() {
var graph = iD.Graph({
'a': iD.Node({id: 'a', loc: [0, 0]}),
'b': iD.Node({id: 'b', loc: [2, 0], tags: {foo: 'bar'}}),
'c': iD.Node({id: 'c', loc: [2, 2]}),
'-': iD.Way({id: '-', nodes: ['a', 'b', 'c']})
});
graph = iD.actions.Straighten('-', projection)(graph);
expect(graph.entity('-').nodes.sort()).to.eql(['a', 'b', 'c']);
});
it("does not delete nodes connected to other ways", function() {
var graph = iD.Graph({
'a': iD.Node({id: 'a', loc: [0, 0]}),
'b': iD.Node({id: 'b', loc: [2, 0]}),
'c': iD.Node({id: 'c', loc: [2, 2]}),
'd': iD.Node({id: 'd', loc: [0, 2]}),
'-': iD.Way({id: '-', nodes: ['a', 'b', 'c', 'd']}),
'=': iD.Way({id: '=', nodes: ['b']})
});
graph = iD.actions.Straighten('-', projection)(graph);
expect(graph.entity('-').nodes).to.have.length(3);
});
});