Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #2512 - skip over BADNUM lonlat in scattermapbox select #2513

Merged
merged 1 commit into from
Mar 30, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions src/traces/scattermapbox/select.js
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@

var Lib = require('../../lib');
var subtypes = require('../scatter/subtypes');
var BADNUM = require('../../constants/numerical').BADNUM;

module.exports = function selectPoints(searchInfo, polygon) {
var cd = searchInfo.cd;
@@ -29,18 +30,21 @@ module.exports = function selectPoints(searchInfo, polygon) {
for(i = 0; i < cd.length; i++) {
var di = cd[i];
var lonlat = di.lonlat;
var lonlat2 = [Lib.wrap180(lonlat[0]), lonlat[1]];
var xy = [xa.c2p(lonlat2), ya.c2p(lonlat2)];

if(polygon.contains(xy)) {
selection.push({
pointNumber: i,
lon: lonlat[0],
lat: lonlat[1]
});
di.selected = 1;
} else {
di.selected = 0;

if(lonlat[0] !== BADNUM) {
var lonlat2 = [Lib.wrap180(lonlat[0]), lonlat[1]];
var xy = [xa.c2p(lonlat2), ya.c2p(lonlat2)];

if(polygon.contains(xy)) {
selection.push({
pointNumber: i,
lon: lonlat[0],
lat: lonlat[1]
});
di.selected = 1;
} else {
di.selected = 0;
}
}
}
}
4 changes: 4 additions & 0 deletions test/jasmine/tests/select_test.js
Original file line number Diff line number Diff line change
@@ -777,6 +777,10 @@ describe('@flaky Test select box and lasso per trace:', function() {
var assertSelectedPoints = makeAssertSelectedPoints();

var fig = Lib.extendDeep({}, require('@mocks/mapbox_bubbles-text'));

fig.data[0].lon.push(null);
fig.data[0].lat.push(null);

fig.layout.dragmode = 'select';
fig.config = {
mapboxAccessToken: require('@build/credentials.json').MAPBOX_ACCESS_TOKEN