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

Match argument order with AddRelationMember

Browse Source
This commit is contained in:
John Firebaugh
2013-01-18 14:09:53 -08:00
parent 2ee07a3b74
commit f16c54e12f
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/actions/reverse_way.js
+1 -1
View File
@@ -65,7 +65,7 @@ iD.actions.ReverseWay = function(wayId) {
graph.parentRelations(way).forEach(function (relation) {
relation.members.forEach(function (member, index) {
if (member.id === way.id && (role = {forward: 'backward', backward: 'forward'}[member.role])) {
graph = iD.actions.UpdateRelationMember(relation.id, index, {role: role})(graph);
graph = iD.actions.UpdateRelationMember(relation.id, {role: role}, index)(graph);
}
});
});
js/id/actions/split_way.js
+5 -4
View File
@@ -28,11 +28,12 @@ iD.actions.SplitWay = function(nodeId, newWayId) {
graph.parentRelations(way).forEach(function(relation) {
if (relation.isRestriction()) {
var via = relation.memberByRole('via'),
member = relation.memberById(way.id);
var via = relation.memberByRole('via');
if (via && newWay.contains(via.id)) {
graph = iD.actions.UpdateRelationMember(relation.id, member.index, {id: newWay.id})(graph);
graph = iD.actions.UpdateRelationMember(
relation.id,
{id: newWay.id},
relation.memberById(way.id).index)(graph);
}
}
});
js/id/actions/update_relation_member.js
+1 -1
View File
@@ -1,4 +1,4 @@
iD.actions.UpdateRelationMember = function(relationId, index, properties) {
iD.actions.UpdateRelationMember = function(relationId, properties, index) {
return function(graph) {
var relation = graph.entity(relationId),
members = relation.members.slice();
test/spec/actions/update_relation_member.js
+1 -1
View File
@@ -2,7 +2,7 @@ describe("iD.actions.UpdateRelationMember", function () {
it("updates the properties of the relation member at the specified index", function () {
var node = iD.Node(),
relation = iD.Relation({members: [{id: node.id, role: 'forward'}]}),
graph = iD.actions.UpdateRelationMember(relation.id, 0, {role: 'backward'})(iD.Graph([node, relation]));
graph = iD.actions.UpdateRelationMember(relation.id, {role: 'backward'}, 0)(iD.Graph([node, relation]));
expect(graph.entity(relation.id).members).to.eql([{id: node.id, role: 'backward'}]);
});
});