move BADNUM checks in polygon contains

- also make sure that 'lasso' dragmode is tested

Author: etpinard

src/lib/polygon.js

@@ -10,6 +10,7 @@
 'use strict';
 
 var dot = require('./matrix').dot;
+var BADNUM = require('../constants/numerical').BADNUM;
 
 var polygon = module.exports = {};
 
@@ -73,7 +74,7 @@ polygon.tester = function tester(ptsIn) {
         var x = pt[0],
             y = pt[1];
 
-        if(x < xmin || x > xmax || y < ymin || y > ymax) {
+        if(x === BADNUM || x < xmin || x > xmax || y === BADNUM || y < ymin || y > ymax) {
             // pt is outside the bounding box of polygon
             return false;
         }
@@ -86,7 +87,7 @@ polygon.tester = function tester(ptsIn) {
         var x = pt[0],
             y = pt[1];
 
-        if(x < xmin || x > xmax || y < ymin || y > ymax) {
+        if(x === BADNUM || x < xmin || x > xmax || y === BADNUM || y < ymin || y > ymax) {
             // pt is outside the bounding box of polygon
             return false;
         }

src/traces/scatter/select.js

@@ -10,7 +10,6 @@
 'use strict';
 
 var subtypes = require('./subtypes');
-var BADNUM = require('../../constants/numerical').BADNUM;
 
 var DESELECTDIM = 0.2;
 
@@ -42,10 +41,6 @@ module.exports = function selectPoints(searchInfo, polygon) {
             x = xa.c2p(di.x);
             y = ya.c2p(di.y);
 
-            if(x === BADNUM || y === BADNUM) {
-                continue;
-            }
-
             if(polygon.contains([x, y])) {
                 selection.push({
                     curveNumber: curveNumber,

test/jasmine/tests/select_test.js

@@ -346,6 +346,14 @@ describe('select box and lasso', function() {
             expect(pts.length).toEqual(1);
             expect(pts[0].x).toEqual(0);
             expect(pts[0].y).toEqual(0);
+
+            return Plotly.relayout(gd, 'dragmode', 'lasso');
+        })
+        .then(function() {
+            drag([[100, 100], [100, 300], [300, 300], [300, 100], [100, 100]]);
+            expect(pts.length).toEqual(1);
+            expect(pts[0].x).toEqual(0);
+            expect(pts[0].y).toEqual(0);
         })
         .then(done);
     });