Lasso action

This commit is contained in:
Tom MacWright
2013-02-07 16:21:25 -05:00
parent b9d80538b1
commit f0b761b979
5 changed files with 130 additions and 4 deletions
+7 -4
View File
@@ -1398,6 +1398,13 @@ a.success-action {
border-radius: 4px;
}
.lasso-box {
fill-opacity:0.2;
fill: #bde5aa;
stroke: #000;
stroke-width: 1;
}
/* Media Queries
------------------------------------------------------- */
@@ -1408,10 +1415,6 @@ a.success-action {
.save .label, .apply .label, .cancel .label { display: block;}
}
div.combobox {
width:155px;
z-index: 9999;
+2
View File
@@ -75,6 +75,7 @@
<script src='js/id/ui/restore.js'></script>
<script src='js/id/ui/tag_reference.js'></script>
<script src='js/id/ui/key_reference.js'></script>
<script src='js/id/ui/lasso.js'></script>
<script src='js/id/actions.js'></script>
<script src="js/id/actions/add_midpoint.js"></script>
@@ -102,6 +103,7 @@
<script src='js/id/behavior/drag.js'></script>
<script src='js/id/behavior/drag_node.js'></script>
<script src='js/id/behavior/draw.js'></script>
<script src='js/id/behavior/lasso.js'></script>
<script src='js/id/behavior/draw_way.js'></script>
<script src='js/id/behavior/hash.js'></script>
<script src='js/id/behavior/hover.js'></script>
+57
View File
@@ -0,0 +1,57 @@
iD.behavior.Lasso = function(context) {
var behavior = function(selection) {
var timeout = null,
// the position of the first mousedown
pos = null,
lasso;
function mousedown() {
if (d3.event.shiftKey === true) {
lasso = iD.ui.lasso().a(d3.mouse(context.surface().node()));
context.surface().call(lasso);
selection
.on('mousemove.lasso', mousemove)
.on('mouseup.lasso', mouseup);
d3.event.stopPropagation();
d3.event.preventDefault();
}
}
function mousemove() {
lasso.b(d3.mouse(context.surface().node()));
}
function mouseup() {
var extent = iD.geo.Extent(
context.projection.invert(lasso.a()),
context.projection.invert(lasso.b()));
lasso.close();
var selected = context.graph().intersects(extent);
if (selected.length) {
context.enter(iD.modes.Select(context, _.pluck(selected, 'id')));
}
selection
.on('mousemove.lasso', null);
}
selection
.on('mousedown.select', mousedown);
};
behavior.off = function(selection) {
selection.on('mousedown.lasso', null);
};
return behavior;
};
+1
View File
@@ -10,6 +10,7 @@ iD.modes.Browse = function(context) {
var behaviors = [
iD.behavior.Hover(),
iD.behavior.Select(context),
iD.behavior.Lasso(context),
iD.behavior.DragNode(context)];
mode.enter = function() {
+63
View File
@@ -0,0 +1,63 @@
iD.ui.lasso = function() {
var center, box,
group,
a = [0, 0],
b = [0, 0];
function lasso(selection) {
group = selection.append('g')
.attr('class', 'lasso')
.attr('opacity', 0);
box = group.append('rect')
.attr('class', 'lasso-box');
group.transition()
.style('opacity', 1);
}
// top-left
function topLeft(d) {
return 'translate(' +
[Math.min(d[0][0], d[1][0]), Math.min(d[0][1], d[1][1])] + ')';
}
function width(d) { return Math.abs(d[0][0] - d[1][0]); }
function height(d) { return Math.abs(d[0][1] - d[1][1]); }
function draw() {
if (box) {
box.data([[a, b]])
.attr('transform', topLeft)
.attr('width', width)
.attr('height', height);
}
}
lasso.a = function(_) {
if (!arguments.length) return a;
a = _;
draw();
return lasso;
};
lasso.b = function(_) {
if (!arguments.length) return b;
b = _;
draw();
return lasso;
};
lasso.close = function(selection) {
if (group) {
group.transition()
.attr('opacity', 0)
.remove();
}
};
return lasso;
};