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

Minor code cleanups, swap some math for existing functions

Browse Source
This commit is contained in:
Bryan Housel
2019-03-22 15:28:13 -04:00
parent 97dc659b0f
commit f6c284a3be
2 changed files with 71 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/operations/straighten.js
+17 -19
View File
@@ -1,7 +1,5 @@
import _uniq from 'lodash-es/uniq';
import _difference from 'lodash-es/difference';
import _includes from 'lodash-es/includes';
import _filter from 'lodash-es/filter';
import { t } from '../util/locale';
import { actionStraighten } from '../actions/index';
@@ -18,24 +16,21 @@ export function operationStraighten(selectedIDs, context) {
operation.available = function() {
var nodes = [],
startNodes = [],
endNodes = [],
selectedNodes = [];
var nodes = [];
var startNodes = [];
var endNodes = [];
var selectedNodes = [];
// collect nodes along selected ways
for (var i = 0; i < selectedIDs.length; i++) {
if (!context.hasEntity(selectedIDs[i])) return false;
var entity = context.entity(selectedIDs[i]);
if (entity.type === 'node') {
selectedNodes.push(entity.id);
continue;
}
if (entity.type !== 'way' ||
entity.isClosed()) {
return false;
} else if (entity.type !== 'way' || entity.isClosed()) {
return false; // exit early, can't straighten these
}
nodes = nodes.concat(entity.nodes);
@@ -44,23 +39,26 @@ export function operationStraighten(selectedIDs, context) {
}
// Remove duplicate end/startNodes (duplicate nodes cannot be at the line end)
startNodes = _filter(startNodes, function(n) {
startNodes = startNodes.filter(function(n) {
return startNodes.indexOf(n) === startNodes.lastIndexOf(n);
});
endNodes = _filter(endNodes, function(n) {
endNodes = endNodes.filter(function(n) {
return endNodes.indexOf(n) === endNodes.lastIndexOf(n);
});
// Return false if line is only 2 nodes long
// Return false unless exactly 0 or 2 specific nodes are selected
if (_uniq(nodes).length <= 2 || !_includes([0,2], selectedNodes.length)) return false;
if (_uniq(nodes).length <= 2) return false;
// Return false unless exactly 0 or 2 specific start/end nodes are selected
if (!(selectedNodes.length === 0 || selectedNodes.length === 2)) return false;
// Ensure all ways are connected (i.e. only 2 unique endpoints/startpoints)
if (_difference(startNodes, endNodes).length + _difference(endNodes, startNodes).length !== 2) return false;
// Ensure both selected nodes lie on the selected path
if (selectedNodes.length && (!_includes(nodes, selectedNodes[0]) ||
!_includes(nodes, selectedNodes[1]))) return false;
// Ensure both start/end selected nodes lie on the selected path
if (selectedNodes.length === 2 && (
nodes.indexOf(selectedNodes[0]) === -1 || nodes.indexOf(selectedNodes[1]) === -1
)) return false;
return true;
};