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

Child and sibling vertices should be eligible for drag_node

Browse Source 
(closes #3799, see also #3801)
This commit is contained in:
Bryan Housel
2017-01-27 13:02:27 -05:00
parent 6677d15c44
commit 0440054cd9
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/modes/drag_node.js
+12 -9
View File
@@ -81,17 +81,18 @@ export function modeDragNode(context) {
function start(entity) {
wasMidpoint = entity.type === 'midpoint';
var editableIDs = [ entity.id ];
context.graph().parentWays(entity).forEach(function (parentWay) {
editableIDs.push(parentWay.id);
editableIDs = editableIDs.concat(_.map(context.graph().parentRelations(parentWay), 'id'));
});
// vertices classed "sibling" include: (see svg/vertices.js)
// - children of selected ways or multipolygons
// - vertices sharing a way with selected vertices
var selection = d3.selectAll('g.' + entity.id),
isSibling = !selection.empty() && selection.classed('sibling');
isCancelled = d3.event.sourceEvent.shiftKey ||
!(wasMidpoint || _.some(editableIDs, function (editableID) { return selectedIDs.indexOf(editableID) !== -1; })) ||
isCancelled = d3.event.sourceEvent.shiftKey || !(wasMidpoint || isSibling) ||
context.features().hasHiddenConnections(entity, context.graph());
if (isCancelled) return behavior.cancel();
if (isCancelled) {
return behavior.cancel();
}
if (wasMidpoint) {
var midpoint = entity;
@@ -105,10 +106,12 @@ export function modeDragNode(context) {
context.perform(actionNoop());
}
// activeIDs generate no pointer events. This prevents the node or vertex
// being dragged from trying to connect to itself or its parent element.
activeIDs = _.map(context.graph().parentWays(entity), 'id');
activeIDs.push(entity.id);
setActiveElements();
context.enter(mode);
}