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

Start lasso on left button only, refactor lassoed()

Browse Source
This commit is contained in:
Bryan Housel
2016-03-15 15:45:19 -04:00
parent e0d7daad3a
commit b643bf105e
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/id/behavior/lasso.js
+19 -13
View File
@@ -4,7 +4,8 @@ iD.behavior.Lasso = function(context) {
var lasso;
function mousedown() {
if (d3.event.shiftKey === true) {
var button = 0; // left
if (d3.event.button === button && d3.event.shiftKey === true) {
lasso = null;
selection
@@ -30,6 +31,20 @@ iD.behavior.Lasso = function(context) {
[Math.max(a[0], b[0]), Math.max(a[1], b[1])]];
}
function lassoed() {
if (!lasso) return [];
var graph = context.graph(),
bounds = lasso.extent().map(context.projection.invert),
extent = iD.geo.Extent(normalize(bounds[0], bounds[1]));
return _.pluck(context.intersects(extent).filter(function(entity) {
return entity.type === 'node' &&
iD.geo.pointInPolygon(context.projection(entity.loc), lasso.coordinates) &&
!context.features().isHidden(entity, graph, entity.geometry(graph));
}), 'id');
}
function mouseup() {
selection
.on('mousemove.lasso', null)
@@ -37,20 +52,11 @@ iD.behavior.Lasso = function(context) {
if (!lasso) return;
var graph = context.graph(),
bounds = lasso.extent().map(context.projection.invert),
extent = iD.geo.Extent(normalize(bounds[0], bounds[1]));
var ids = lassoed();
lasso.close();
var selected = context.intersects(extent).filter(function(entity) {
return entity.type === 'node' &&
iD.geo.pointInPolygon(context.projection(entity.loc), lasso.coordinates) &&
!context.features().isHidden(entity, graph, entity.geometry(graph));
});
if (selected.length) {
context.enter(iD.modes.Select(context, _.pluck(selected, 'id')));
if (ids.length) {
context.enter(iD.modes.Select(context, ids));
}
}