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

Ignore unaffected nodes when determining if Disconnect is disabled due to lack of visibility (close #7944)

Browse Source
This commit is contained in:
Quincy Morgan
2020-09-02 13:14:19 -04:00
parent b9005f85f1
commit 43f5386dad
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/operations/disconnect.js
View File

@@ -58,12 +58,13 @@ export function operationDisconnect(context, selectedIDs) {
});
_nodes = utilGetAllNodes(_wayIDs, context.graph());
_coords = _nodes.map(function(n) { return n.loc; });
_extent = utilTotalExtent(ways, context.graph());
// actions for connected nodes shared by at least two selected ways
var sharedActions = [];
var sharedNodes = [];
// actions for connected nodes
var unsharedActions = [];
var unsharedNodes = [];
_nodes.forEach(function(node) {
var action = actionDisconnect(node.id).limitWays(_wayIDs);
@@ -80,8 +81,10 @@ export function operationDisconnect(context, selectedIDs) {
if (count > 1) {
sharedActions.push(action);
sharedNodes.push(node);
} else {
unsharedActions.push(action);
unsharedNodes.push(node);
}
}
});
@@ -92,11 +95,13 @@ export function operationDisconnect(context, selectedIDs) {
if (sharedActions.length) {
// if any nodes are shared, only disconnect the selected ways from each other
_actions = sharedActions;
_extent = utilTotalExtent(sharedNodes, context.graph());
_descriptionID += 'conjoined';
_annotationID = 'from_each_other';
} else {
// if no nodes are shared, disconnect the selected ways from all connected ways
_actions = unsharedActions;
_extent = utilTotalExtent(unsharedNodes, context.graph());
if (_wayIDs.length === 1) {
_descriptionID += context.graph().geometry(_wayIDs[0]);
} else {