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

Merge branch 'master' of github.com:systemed/iD

Browse Source
This commit is contained in:
Saman Bemel-Benrud
2013-01-29 17:56:56 -05:00
parent bfafc8e929 699041019f
commit 193b476e49
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/behavior/drag_node.js
+29
View File
@@ -1,7 +1,30 @@
iD.behavior.DragNode = function(mode) {
var history = mode.history,
size = mode.map.size(),
nudgeInterval,
projection = mode.map.projection;
function edge(point) {
var pad = [30, 100, 30, 100];
if (point[0] > size[0] - pad[0]) return [-10, 0];
else if (point[0] < pad[2]) return [10, 0];
else if (point[1] > size[1] - pad[1]) return [0, -10];
else if (point[1] < pad[3]) return [0, 10];
return null;
}
function startNudge(nudge) {
if (nudgeInterval) window.clearInterval(nudgeInterval);
nudgeInterval = window.setInterval(function() {
mode.map.pan(nudge).redraw();
}, 50);
}
function stopNudge(nudge) {
if (nudgeInterval) window.clearInterval(nudgeInterval);
nudgeInterval = null;
}
return iD.behavior.drag()
.delegate(".node")
.origin(function(entity) {
@@ -13,11 +36,17 @@ iD.behavior.DragNode = function(mode) {
})
.on('move', function(entity) {
d3.event.sourceEvent.stopPropagation();
var nudge = edge(d3.event.point);
if (nudge) startNudge(nudge);
else stopNudge();
history.replace(
iD.actions.MoveNode(entity.id, projection.invert(d3.event.point)),
'moved a node');
})
.on('end', function() {
stopNudge();
history.replace(
iD.actions.Noop(),
'moved a node');
js/id/renderer/map.js
+10
View File
@@ -258,9 +258,19 @@ iD.Map = function() {
t[0] - ll[0] + c[0],
t[1] - ll[1] + c[1]]);
zoom.translate(projection.translate());
dispatch.move(map);
return true;
}
map.pan = function(d) {
var t = projection.translate();
t[0] += d[0];
t[1] += d[1];
projection.translate(t);
zoom.translate(projection.translate());
return map;
};
map.size = function(_) {
if (!arguments.length) return dimensions;
dimensions = _;