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

SplitWay -> Split

Browse Source
This commit is contained in:
John Firebaugh
2013-02-01 15:56:48 -05:00
parent e1d5a0cb03
commit c86792a77b
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
combobox.html
+1 -1
View File
@@ -85,7 +85,7 @@
<script src='js/id/actions/circularize.js'></script>
<script src='js/id/actions/noop.js'></script>
<script src='js/id/actions/reverse_way.js'></script>
<script src='js/id/actions/split_way.js'></script>
<script src='js/id/actions/split.js'></script>
<script src='js/id/behavior.js'></script>
<script src='js/id/behavior/add_way.js'></script>
index.html
+1 -1
View File
@@ -86,7 +86,7 @@
<script src='js/id/actions/circularize.js'></script>
<script src='js/id/actions/noop.js'></script>
<script src='js/id/actions/reverse_way.js'></script>
<script src='js/id/actions/split_way.js'></script>
<script src='js/id/actions/split.js'></script>
<script src='js/id/behavior.js'></script>
<script src='js/id/behavior/add_way.js'></script>
js/id/actions/split_way.js → js/id/actions/split.js
+1 -1
View File
@@ -7,7 +7,7 @@
// Reference:
// https://github.com/systemed/potlatch2/blob/master/net/systemeD/halcyon/connection/actions/SplitWayAction.as
//
iD.actions.SplitWay = function(nodeId, newWayId) {
iD.actions.Split = function(nodeId, newWayId) {
function candidateWays(graph) {
var node = graph.entity(nodeId),
parents = graph.parentWays(node);
js/id/operations/split.js
+1 -1
View File
@@ -1,6 +1,6 @@
iD.operations.Split = function(selection, context) {
var entityId = selection[0],
action = iD.actions.SplitWay(entityId);
action = iD.actions.Split(entityId);
var operation = function() {
context.perform(action, t('operations.split.annotation'));
test/index.html
+2 -2
View File
@@ -82,7 +82,7 @@
<script src='../js/id/actions/move_way.js'></script>
<script src='../js/id/actions/noop.js'></script>
<script src='../js/id/actions/reverse_way.js'></script>
<script src='../js/id/actions/split_way.js'></script>
<script src='../js/id/actions/split.js'></script>
<script src='../js/id/behavior.js'></script>
<script src='../js/id/behavior/add_way.js'></script>
@@ -151,7 +151,7 @@
<script src="spec/actions/move_way.js"></script>
<script src="spec/actions/noop.js"></script>
<script src="spec/actions/reverse_way.js"></script>
<script src="spec/actions/split_way.js"></script>
<script src="spec/actions/split.js"></script>
<script src="spec/geo/extent.js"></script>
test/index_packaged.html
+1 -1
View File
@@ -44,7 +44,7 @@
<script src="spec/actions/move_way.js"></script>
<script src="spec/actions/noop.js"></script>
<script src="spec/actions/reverse_way.js"></script>
<script src="spec/actions/split_way.js"></script>
<script src="spec/actions/split.js"></script>
<script src="spec/geo/extent.js"></script>
test/spec/actions/split_way.js → test/spec/actions/split.js
+14 -14
View File
@@ -1,4 +1,4 @@
describe("iD.actions.SplitWay", function () {
describe("iD.actions.Split", function () {
describe("#enabled", function () {
it("returns true for a non-end node of a single way", function () {
var graph = iD.Graph({
@@ -8,7 +8,7 @@ describe("iD.actions.SplitWay", function () {
'-': iD.Way({id: '-', nodes: ['a', 'b', 'c']})
});
expect(iD.actions.SplitWay('b').enabled(graph)).to.be.true;
expect(iD.actions.Split('b').enabled(graph)).to.be.true;
});
it("returns false for the first node of a single way", function () {
@@ -18,7 +18,7 @@ describe("iD.actions.SplitWay", function () {
'-': iD.Way({id: '-', nodes: ['a', 'b']})
});
expect(iD.actions.SplitWay('a').enabled(graph)).to.be.false;
expect(iD.actions.Split('a').enabled(graph)).to.be.false;
});
it("returns false for the last node of a single way", function () {
@@ -28,7 +28,7 @@ describe("iD.actions.SplitWay", function () {
'-': iD.Way({id: '-', nodes: ['a', 'b']})
});
expect(iD.actions.SplitWay('b').enabled(graph)).to.be.false;
expect(iD.actions.Split('b').enabled(graph)).to.be.false;
});
});
@@ -48,7 +48,7 @@ describe("iD.actions.SplitWay", function () {
'-': iD.Way({id: '-', nodes: ['a', 'b', 'c']})
});
graph = iD.actions.SplitWay('b', '=')(graph);
graph = iD.actions.Split('b', '=')(graph);
expect(graph.entity('-').nodes).to.eql(['a', 'b']);
expect(graph.entity('=').nodes).to.eql(['b', 'c']);
@@ -63,7 +63,7 @@ describe("iD.actions.SplitWay", function () {
'-': iD.Way({id: '-', nodes: ['a', 'b', 'c'], tags: tags})
});
graph = iD.actions.SplitWay('b', '=')(graph);
graph = iD.actions.Split('b', '=')(graph);
// Immutable tags => should be shared by identity.
expect(graph.entity('-').tags).to.equal(tags);
@@ -92,7 +92,7 @@ describe("iD.actions.SplitWay", function () {
'|': iD.Way({id: '|', nodes: ['d', 'b']})
});
graph = iD.actions.SplitWay('b', '=')(graph);
graph = iD.actions.Split('b', '=')(graph);
expect(graph.entity('-').nodes).to.eql(['a', 'b']);
expect(graph.entity('=').nodes).to.eql(['b', 'c']);
@@ -118,7 +118,7 @@ describe("iD.actions.SplitWay", function () {
'r': iD.Relation({id: 'r', members: [{id: '-', type: 'way'}]})
});
graph = iD.actions.SplitWay('b', '=')(graph);
graph = iD.actions.Split('b', '=')(graph);
expect(_.pluck(graph.entity('r').members, 'id')).to.eql(['-', '=']);
});
@@ -144,7 +144,7 @@ describe("iD.actions.SplitWay", function () {
'r': iD.Relation({id: 'r', members: [{id: '-', type: 'way'}, {id: '~', type: 'way'}]})
});
graph = iD.actions.SplitWay('b', '=')(graph);
graph = iD.actions.Split('b', '=')(graph);
expect(_.pluck(graph.entity('r').members, 'id')).to.eql(['-', '=', '~']);
});
@@ -170,7 +170,7 @@ describe("iD.actions.SplitWay", function () {
'r': iD.Relation({id: 'r', members: [{id: '~', type: 'way'}, {id: '-', type: 'way'}]})
});
graph = iD.actions.SplitWay('b', '=')(graph);
graph = iD.actions.Split('b', '=')(graph);
expect(_.pluck(graph.entity('r').members, 'id')).to.eql(['~', '=', '-']);
});
@@ -184,7 +184,7 @@ describe("iD.actions.SplitWay", function () {
'r': iD.Relation({id: 'r', members: [{id: '~', type: 'way'}, {id: '-', type: 'way'}]})
});
graph = iD.actions.SplitWay('b', '=')(graph);
graph = iD.actions.Split('b', '=')(graph);
expect(_.pluck(graph.entity('r').members, 'id')).to.eql(['~', '-', '=']);
});
@@ -214,7 +214,7 @@ describe("iD.actions.SplitWay", function () {
{id: 'c', role: 'via'}]})
});
graph = iD.actions.SplitWay('b', '=')(graph);
graph = iD.actions.Split('b', '=')(graph);
expect(graph.entity('r').members).to.eql([
{id: '=', role: 'from'},
@@ -246,7 +246,7 @@ describe("iD.actions.SplitWay", function () {
{id: 'c', role: 'via'}]})
});
graph = iD.actions.SplitWay('b', '=')(graph);
graph = iD.actions.Split('b', '=')(graph);
expect(graph.entity('r').members).to.eql([
{id: '~', role: 'from'},
@@ -278,7 +278,7 @@ describe("iD.actions.SplitWay", function () {
{id: 'c', role: 'via'}]})
});
graph = iD.actions.SplitWay('b', '=')(graph);
graph = iD.actions.Split('b', '=')(graph);
expect(graph.entity('r').members).to.eql([
{id: '-', role: 'from'},