CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move -> MoveNode, in preparation for MoveWay

Browse Source
This commit is contained in:
John Firebaugh
2012-12-13 13:58:24 -08:00
parent 15c5f5d866
commit ee3f5cc768
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@@ -53,7 +53,7 @@
<script src='js/id/actions/change_entity_tags.js'></script>
<script src="js/id/actions/delete_node.js"></script>
<script src="js/id/actions/delete_way.js"></script>
<script src='js/id/actions/move.js'></script>
<script src='js/id/actions/move_node.js'></script>
<script src='js/id/actions/noop.js'></script>
<script src='js/id/actions/remove_relation_member.js'></script>
<script src='js/id/actions/remove_way_node.js'></script>

6
js/id/actions/move.js → js/id/actions/move_node.js
View File

@@ -1,8 +1,8 @@
// https://github.com/openstreetmap/josm/blob/mirror/src/org/openstreetmap/josm/command/MoveCommand.java
// https://github.com/openstreetmap/potlatch2/blob/master/net/systemeD/halcyon/connection/actions/MoveNodeAction.as
iD.actions.Move = function(entityId, loc) {
iD.actions.MoveNode = function(nodeId, loc) {
return function(graph) {
var entity = graph.entity(entityId);
return graph.replace(entity.update({loc: loc}));
var node = graph.entity(nodeId);
return graph.replace(node.update({loc: loc}));
};
};

4
js/id/modes/drag_features.js
View File

@@ -21,11 +21,11 @@ iD.modes._dragFeatures = function(mode) {
} else {
dragging = entity;
mode.history.perform(
iD.actions.Move(dragging.id, loc));
iD.actions.MoveNode(dragging.id, loc));
}
}
mode.history.replace(iD.actions.Move(dragging.id, loc));
mode.history.replace(iD.actions.MoveNode(dragging.id, loc));
})
.on('dragend', function (entity) {
if (!dragging) return;

2
js/id/modes/draw_area.js
View File

@@ -24,7 +24,7 @@ iD.modes.DrawArea = function(wayId) {
iD.actions.AddWayNode(way.id, node.id, -1));
function mousemove() {
history.replace(iD.actions.Move(node.id, map.mouseCoordinates()));
history.replace(iD.actions.MoveNode(node.id, map.mouseCoordinates()));
}
function click() {

2
js/id/modes/draw_line.js
View File

@@ -25,7 +25,7 @@ iD.modes.DrawLine = function(wayId, direction) {
iD.actions.AddWayNode(wayId, node.id, index));
function mousemove() {
history.replace(iD.actions.Move(node.id, map.mouseCoordinates()));
history.replace(iD.actions.MoveNode(node.id, map.mouseCoordinates()));
}
function click() {

4
test/index.html
View File

@@ -54,7 +54,7 @@
<script src='../js/id/actions/change_entity_tags.js'></script>
<script src="../js/id/actions/delete_node.js"></script>
<script src="../js/id/actions/delete_way.js"></script>
<script src='../js/id/actions/move.js'></script>
<script src='../js/id/actions/move_node.js'></script>
<script src='../js/id/actions/noop.js'></script>
<script src='../js/id/actions/remove_relation_member.js'></script>
<script src='../js/id/actions/remove_way_node.js'></script>
@@ -94,7 +94,7 @@
<script src="spec/actions/change_entity_tags.js"></script>
<script src="spec/actions/delete_node.js"></script>
<script src="spec/actions/delete_way.js"></script>
<script src="spec/actions/move.js"></script>
<script src="spec/actions/move_node.js"></script>
<script src="spec/actions/noop.js"></script>
<script src="spec/actions/remove_way_node.js"></script>
<script src="spec/actions/remove_relation_member.js"></script>

2
test/index_packaged.html
View File

@@ -31,7 +31,7 @@
<script src="spec/actions/change_entity_tags.js"></script>
<script src="spec/actions/delete_node.js"></script>
<script src="spec/actions/delete_way.js"></script>
<script src="spec/actions/move.js"></script>
<script src="spec/actions/move_node.js"></script>
<script src="spec/actions/noop.js"></script>
<script src="spec/actions/remove_way_node.js"></script>
<script src="spec/actions/remove_relation_member.js"></script>

8
test/spec/actions/move.js
View File

@@ -1,8 +0,0 @@
describe("iD.actions.Move", function () {
it("changes an entity's location", function () {
var entity = iD.Entity(),
loc = [2, 3],
graph = iD.actions.Move(entity.id, loc)(iD.Graph([entity]));
expect(graph.entity(entity.id).loc).to.eql(loc);
});
});

8
test/spec/actions/move_node.js Normal file
View File

@@ -0,0 +1,8 @@
describe("iD.actions.MoveNode", function () {
it("changes a node's location", function () {
var node = iD.Node(),
loc = [2, 3],
graph = iD.actions.MoveNode(node.id, loc)(iD.Graph([node]));
expect(graph.entity(node.id).loc).to.eql(loc);
});
});