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

Allow disconnecting an entire way from other ways at once (close #4245)

Browse Source
This commit is contained in:
Quincy Morgan
2019-04-19 11:54:13 -07:00
parent f8299cb205
commit 130e9909f6
4 changed files with 61 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/core.yaml
View File

@@ -191,8 +191,14 @@ en:
disconnect:
title: Disconnect
description: Disconnect these lines/areas from each other.
line:
description: Disconnect this line from other features.
area:
description: Disconnect this area from other features.
key: D
annotation: Disconnected lines/areas.
too_large:
single: This can't be disconnected because not enough of it is currently visible.
not_connected: There aren't enough lines/areas here to disconnect.
connected_to_hidden: This can't be disconnected because it is connected to a hidden feature.
relation: This can't be disconnected because it connects members of a relation.

9
dist/locales/en.json vendored
View File

@@ -246,8 +246,17 @@
"disconnect": {
"title": "Disconnect",
"description": "Disconnect these lines/areas from each other.",
"line": {
"description": "Disconnect this line from other features."
},
"area": {
"description": "Disconnect this area from other features."
},
"key": "D",
"annotation": "Disconnected lines/areas.",
"too_large": {
"single": "This can't be disconnected because not enough of it is currently visible."
},
"not_connected": "There aren't enough lines/areas here to disconnect.",
"connected_to_hidden": "This can't be disconnected because it is connected to a hidden feature.",
"relation": "This can't be disconnected because it connects members of a relation."

3
modules/actions/disconnect.js
View File

@@ -82,9 +82,6 @@ export function actionDisconnect(nodeId, newNodeId) {
var sharedRelation;
parentWays.forEach(function(way) {
if (wayIds && wayIds.indexOf(way.id) === -1)
return;
var relations = graph.parentRelations(way);
relations.forEach(function(relation) {
if (relation.id in seenRelationIds) {

66
modules/operations/disconnect.js
View File

@@ -7,6 +7,7 @@ export function operationDisconnect(selectedIDs, context) {
var vertices = [],
ways = [],
others = [];
var extent;
selectedIDs.forEach(function(id) {
if (context.geometry(id) === 'vertex') {
@@ -20,17 +21,30 @@ export function operationDisconnect(selectedIDs, context) {
var actions = [];
vertices.forEach(function(vertexID) {
var action = actionDisconnect(vertexID);
var disconnectingWay = vertices.length === 0 && ways.length === 1 && ways[0];
if (ways.length > 0) {
var waysIDsForVertex = ways.filter(function(wayID) {
return context.graph().entity(wayID).nodes.includes(vertexID);
});
action.limitWays(waysIDsForVertex);
}
actions.push(action);
});
if (disconnectingWay) {
extent = context.entity(disconnectingWay).extent(context.graph());
context.entity(disconnectingWay).nodes.forEach(function(vertexID) {
var action = actionDisconnect(vertexID).limitWays(ways);
if (action.disabled(context.graph()) !== 'not_connected') {
actions.push(action);
}
});
} else {
vertices.forEach(function(vertexID) {
var action = actionDisconnect(vertexID);
if (ways.length > 0) {
var waysIDsForVertex = ways.filter(function(wayID) {
return context.graph().entity(wayID).nodes.includes(vertexID);
});
action.limitWays(waysIDsForVertex);
}
actions.push(action);
});
}
var operation = function() {
@@ -44,18 +58,26 @@ export function operationDisconnect(selectedIDs, context) {
operation.available = function() {
return vertices.length > 0 &&
others.length === 0 &&
(ways.length === 0 || ways.every(function(way) {
return vertices.some(function(vertex) {
return context.graph().entity(way).nodes.includes(vertex);
});
}));
if (actions.length === 0) return false;
if (others.length !== 0) return false;
if (vertices.length !== 0 && ways.length !== 0 && !ways.every(function(way) {
return vertices.some(function(vertex) {
return context.graph().entity(way).nodes.includes(vertex);
});
})) return false;
return true;
};
operation.disabled = function() {
var reason;
if (extent && extent.area() && extent.percentContainedIn(context.extent()) < 0.8) {
return 'too_large.single';
}
if (selectedIDs.some(context.hasHiddenConnections)) {
reason = 'connected_to_hidden';
}
@@ -70,9 +92,13 @@ export function operationDisconnect(selectedIDs, context) {
operation.tooltip = function() {
var disable = operation.disabled();
return disable ?
t('operations.disconnect.' + disable) :
t('operations.disconnect.description');
if (disable) {
return t('operations.disconnect.' + disable);
}
if (disconnectingWay) {
return t('operations.disconnect.' + context.geometry(disconnectingWay) + '.description');
}
return t('operations.disconnect.description');
};