remove cruft

Author: Fil

src/marks/lasso.js

@@ -32,9 +32,6 @@ export class Lasso extends Mark {
     const margin = 5;
     const {ariaLabel, ariaDescription, ariaHidden, fill, fillOpacity, stroke, strokeWidth} = this;
     const {marginLeft, width, marginRight, marginTop, height, marginBottom} = dimensions;
-    if (!this.lasso) this.lasso = [];
-    const polygons = []; // polygons for this facet
-    this.lasso.push({polygons, index});
 
     const path = line().curve(curveNatural);
     const g = create("svg:g")
@@ -47,10 +44,9 @@ export class Lasso extends Mark {
         .attr("fill", "none")
         .attr("cursor", "cross") // TODO
         .attr("pointer-events", "all")
-        .attr("id", "lasso") // TODO REMOVE
         .attr("fill-rule", "evenodd");
 
-    g.call(lassoer(polygons)
+    g.call(lassoer()
         .extent([[marginLeft - margin, marginTop - margin], [width - marginRight + margin, height - marginBottom + margin]])
         .on("start lasso end cancel", (polygons) => {
           g.selectAll("path")
@@ -111,12 +107,13 @@ function trackPointer(e, { start, move, out, end }) {
   start && start(tracker);
 }
 
-function lassoer(polygons = []) {
+function lassoer() {
+  const polygons = [];
   const dispatch = dispatcher("start", "lasso", "end", "cancel");
   let extent;
   const lasso = selection => {
     const node = selection.node();
-    let polygon;
+    let currentPolygon;
 
     selection
       .on("touchmove", e => e.preventDefault()) // prevent scrolling
@@ -131,12 +128,12 @@ function lassoer(polygons = []) {
         }
         trackPointer(e, {
           start: p => {
-            polygon = [constrainExtent(p.point)];
-            polygons.push(polygon);
+            currentPolygon = [constrainExtent(p.point)];
+            polygons.push(currentPolygon);
             dispatch.call("start", node, polygons);
           },
           move: p => {
-            polygon.push(constrainExtent(p.point));
+            currentPolygon.push(constrainExtent(p.point));
             dispatch.call("lasso", node, polygons);
           },
           end: () => {

test/output/penguinCulmenLasso.html

@@ -432,7 +432,7 @@
           <circle cx="32.58333333333335" cy="155.67272727272726" r="3"></circle>
         </g>
         <g aria-label="lasso" fill="green" fill-opacity="0.3" stroke="#666" stroke-width="2">
-          <rect x="0" y="30" width="161" height="240" fill="none" cursor="cross" pointer-events="all" id="lasso" fill-rule="evenodd"></rect>
+          <rect x="0" y="30" width="161" height="240" fill="none" cursor="cross" pointer-events="all" fill-rule="evenodd"></rect>
         </g>
       </g>
       <g transform="translate(219,0)">
@@ -784,7 +784,7 @@
           <circle cx="57.50000000000003" cy="114.65454545454547" r="3"></circle>
         </g>
         <g aria-label="lasso" fill="green" fill-opacity="0.3" stroke="#666" stroke-width="2">
-          <rect x="0" y="30" width="161" height="240" fill="none" cursor="cross" pointer-events="all" id="lasso" fill-rule="evenodd"></rect>
+          <rect x="0" y="30" width="161" height="240" fill="none" cursor="cross" pointer-events="all" fill-rule="evenodd"></rect>
         </g>
       </g>
       <g transform="translate(398,0)">
@@ -1136,7 +1136,7 @@
           <circle cx="49.83333333333333" cy="161.78181818181818" r="3"></circle>
         </g>
         <g aria-label="lasso" fill="green" fill-opacity="0.3" stroke="#666" stroke-width="2">
-          <rect x="0" y="30" width="161" height="240" fill="none" cursor="cross" pointer-events="all" id="lasso" fill-rule="evenodd"></rect>
+          <rect x="0" y="30" width="161" height="240" fill="none" cursor="cross" pointer-events="all" fill-rule="evenodd"></rect>
         </g>
       </g>
     </g>