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

Don't try to snap new way to offscreen area

Browse Source 
(closes #3114)
This commit is contained in:
Bryan Housel
2016-05-16 23:35:14 -04:00
parent cd7dbdd72d
commit 6bced5bcbd
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/id/behavior/draw.js
View File

@@ -83,9 +83,19 @@ iD.behavior.Draw = function(context) {
function click() {
var d = datum();
if (d.type === 'way') {
var choice = iD.geo.chooseEdge(context.childNodes(d), context.mouse(), context.projection),
edge = [d.nodes[choice.index - 1], d.nodes[choice.index]];
event.clickWay(choice.loc, edge);
var dims = context.map().dimensions(),
mouse = context.mouse(),
pad = 5,
trySnap = mouse[0] > pad && mouse[0] < dims[0] - pad &&
mouse[1] > pad && mouse[1] < dims[1] - pad;
if (trySnap) {
var choice = iD.geo.chooseEdge(context.childNodes(d), context.mouse(), context.projection),
edge = [d.nodes[choice.index - 1], d.nodes[choice.index]];
event.clickWay(choice.loc, edge);
} else {
event.click(context.map().mouseCoordinates());
}
} else if (d.type === 'node') {
event.clickNode(d);

15
js/id/behavior/draw_way.js
View File

@@ -30,9 +30,20 @@ iD.behavior.DrawWay = function(context, wayId, index, mode, baseGraph) {
if (datum.type === 'node' && datum.id !== end.id) {
loc = datum.loc;
} else if (datum.type === 'way' && datum.id !== segment.id) {
loc = iD.geo.chooseEdge(context.childNodes(datum), context.mouse(), context.projection).loc;
} else {
var dims = context.map().dimensions(),
mouse = context.mouse(),
pad = 5,
trySnap = mouse[0] > pad && mouse[0] < dims[0] - pad &&
mouse[1] > pad && mouse[1] < dims[1] - pad;
if (trySnap) {
loc = iD.geo.chooseEdge(context.childNodes(datum), context.mouse(), context.projection).loc;
}
}
if (!loc) {
loc = context.map().mouseCoordinates();
}