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.

Sign up for GitHub

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

Bump mapbox gl to 0.44.0 #2361

Merged
merged 15 commits into from
Feb 14, 2018
Merged

Bump mapbox gl to 0.44.0 #2361

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8d60a78
bump mapbox-gl to 0.44.0 + update src and test
etpinard Feb 6, 2018
550d7f6
add 'wrong mapbox-gl version' error
etpinard Feb 12, 2018
ae9cba8
clean up scattermapbox event data tests
etpinard Feb 12, 2018
fcb8c25
add 'some' mapbox-gl css rule
etpinard Feb 12, 2018
278adec
resolves #2346 - add (un)selected.marker color/size support
etpinard Feb 12, 2018
8443d63
make scattermapbox first render faster
etpinard Feb 12, 2018
de42330
fix scattermapbox hover & selection for 180 < lon < 360
etpinard Feb 12, 2018
eed0dd6
lint a few things in mapbox subplot src files
etpinard Feb 12, 2018
bc17361
update mapbox image generation script
etpinard Feb 12, 2018
9cdba10
update mapbox baselines (using new image-exporter)
etpinard Feb 12, 2018
3d4befc
fixes #2343 - clear select outlines on mapbox zoomstart
etpinard Feb 13, 2018
51c3128
clear select outlines on 1st scroll event on cartesian subplots
etpinard Feb 13, 2018
1998f90
fixup + :lock: (un)selected fallbacks
etpinard Feb 13, 2018
0ef2ba6
revert patch in (un)hover event data assertion
etpinard Feb 13, 2018
b79abb5
:hocho: dumb abstraction
etpinard Feb 14, 2018
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
74 changes: 46 additions & 28 deletions src/components/drawing/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,8 @@ drawing.pointStyle = function(s, trace, gd) {
});
};

drawing.selectedPointStyle = function(s, trace) {
if(!s.size() || !trace.selectedpoints) return;
drawing.makeSelectedPointStyleFns = function(trace) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice abstraction here 👌

var out = {};

var selectedAttrs = trace.selected || {};
var unselectedAttrs = trace.unselected || {};
Expand All @@ -455,59 +455,77 @@ drawing.selectedPointStyle = function(s, trace) {
var smoIsDefined = smo !== undefined;
var usmoIsDefined = usmo !== undefined;

s.each(function(d) {
var pt = d3.select(this);
out.opacityFn = function(d) {
var dmo = d.mo;
var dmoIsDefined = dmo !== undefined;
var mo2;

if(dmoIsDefined || smoIsDefined || usmoIsDefined) {
if(d.selected) {
if(smoIsDefined) mo2 = smo;
if(smoIsDefined) return smo;
} else {
if(usmoIsDefined) mo2 = usmo;
else mo2 = DESELECTDIM * (dmoIsDefined ? dmo : mo);
if(usmoIsDefined) return usmo;
return DESELECTDIM * (dmoIsDefined ? dmo : mo);
}
}

if(mo2 !== undefined) pt.style('opacity', mo2);
});
};

var smc = selectedMarker.color;
var usmc = unselectedMarker.color;

if(smc || usmc) {
s.each(function(d) {
var pt = d3.select(this);
var mc2;

out.colorFn = function(d) {
if(d.selected) {
if(smc) mc2 = smc;
if(smc) return smc;
} else {
if(usmc) mc2 = usmc;
if(usmc) return usmc;
}

if(mc2) Color.fill(pt, mc2);
});
};
}

var sms = selectedMarker.size;
var usms = unselectedMarker.size;
var smsIsDefined = sms !== undefined;
var usmsIsDefined = usms !== undefined;

if(Registry.traceIs(trace, 'symbols') && (smsIsDefined || usmsIsDefined)) {
s.each(function(d) {
var pt = d3.select(this);
if(smsIsDefined || usmsIsDefined) {
out.sizeFn = function(d) {
var mrc = d.mrc;
var mx = d.mx || marker.symbol || 0;
var mrc2;

if(d.selected) {
mrc2 = (smsIsDefined) ? sms / 2 : mrc;
return smsIsDefined ? sms / 2 : mrc;
} else {
mrc2 = (usmsIsDefined) ? usms / 2 : mrc;
return usmsIsDefined ? usms / 2 : mrc;
}
};
}

return out;
};

drawing.selectedPointStyle = function(s, trace) {
if(!s.size() || !trace.selectedpoints) return;

var fns = drawing.makeSelectedPointStyleFns(trace);
var marker = trace.marker || {};

s.each(function(d) {
var pt = d3.select(this);
var mo2 = fns.opacityFn(d);
if(mo2 !== undefined) pt.style('opacity', mo2);
});

if(fns.colorFn) {
s.each(function(d) {
var pt = d3.select(this);
var mc2 = fns.colorFn(d);
if(mc2) Color.fill(pt, mc2);
});
}

if(Registry.traceIs(trace, 'symbols') && fns.sizeFn) {
s.each(function(d) {
var pt = d3.select(this);
var mx = d.mx || marker.symbol || 0;
var mrc2 = fns.sizeFn(d);

pt.attr('d', makePointPath(drawing.symbolNumber(mx), mrc2));

Expand Down
9 changes: 2 additions & 7 deletions src/traces/scattermapbox/attributes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ var overrideAll = require('../../plot_api/edit_types').overrideAll;
var lineAttrs = scatterGeoAttrs.line;
var markerAttrs = scatterGeoAttrs.marker;


module.exports = overrideAll({
lon: scatterGeoAttrs.lon,
lat: scatterGeoAttrs.lat,
Expand Down Expand Up @@ -108,14 +107,10 @@ module.exports = overrideAll({
textposition: mapboxAttrs.layers.symbol.textposition,

selected: {
marker: {
opacity: scatterAttrs.selected.marker.opacity
}
marker: scatterAttrs.selected.marker
},
unselected: {
marker: {
opacity: scatterAttrs.unselected.marker.opacity
}
marker: scatterAttrs.unselected.marker
},

hoverinfo: extendFlat({}, plotAttrs.hoverinfo, {
Expand Down
Loading