8000 Bump mapbox gl to 0.44.0 by etpinard · Pull Request #2361 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Bump mapbox gl to 0.44.0 #2361

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

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
Prev Previous commit
Next Next commit
fixup + 🔒 (un)selected fallbacks
  • Loading branch information
@etpinard
etpinard committed Feb 13, 2018
commit 1998f90a2521d53a80e5a8b718c5ca7d97ded917
5 changes: 4 additions & 1 deletion src/traces/scattermapbox/convert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ function makeCircleOpts(calcTrace) {
if(colorFn) props.mcc = calcPt.mcc = colorFn(calcPt.mc);
if(sizeFn) props.mrc = calcPt.mrc = sizeFn(calcPt.ms);
if(opacityFn) props.mo = opacityFn(calcPt.mo);
if(selectedpoints) props.selected = calcPt.selected;
if(selectedpoints) props.selected = calcPt.selected || 0;

features.push({
type: 'Feature',
Expand All @@ -207,15 +207,18 @@ function makeCircleOpts(calcTrace) {

var mo2 = fns.opacityFn(d);
if(mo2 !== undefined) d.mo = addTraceOpacity(mo2);
else if(d.mo === undefined) d.mo = addTraceOpacity(marker.opacity);

if(fns.colorFn) {
var mc2 = fns.colorFn(d);
if(mc2) d.mcc = mc2;
else if(!d.mcc) d.mcc = marker.color;
}

if(fns.sizeFn) {
var mrc2 = fns.sizeFn(d);
if(mrc2 !== undefined) d.mrc = mrc2;
else if(d.mrc === undefined) d.mrc = size2radius(marker.size);
}
}
}
Expand Down
155 changes: 144 additions & 11 deletions test/jasmine/tests/scattermapbox_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ describe('scattermapbox convert', function() {
], 'geojson feature properties');
});

it('should fill circle-opacity correctly during selections', function() {
it('should fill circle props correctly during selections', function() {
var _base = {
type: 'scattermapbox',
mode: 'markers',
Expand All @@ -222,46 +222,179 @@ describe('scattermapbox convert', function() {
};

var specs = [{
msg: 'base case',
patch: {
selectedpoints: [1, 2]
},
expected: [0.2, 1, 1]
expected: {
opacity: [0.2, 1, 1]
}
}, {
msg: 'with set trace opacity',
patch: {
opacity: 0.5,
selectedpoints: [1, 2]
},
expected: [0.1, 0.5, 0.5]
expected: {
opacity: [0.1, 0.5, 0.5]
}
}, {
msg: 'with set scalar marker.opacity',
patch: {
marker: {opacity: 0.6},
selectedpoints: [1, 2]
},
expected: [0.12, 0.6, 0.6]
expected: {
opacity: [0.12, 0.6, 0.6]
}
}, {
msg: 'width set array marker.opacity',
patch: {
marker: {
opacity: [0.5, 1, 0.6],
},
selectedpoints: [0, 2]
},
expected: [0.5, 0.2, 0.6]
expected: {
opacity: [0.5, 0.2, 0.6]
}
}, {
msg: 'with set array marker.opacity including invalid items',
patch: {
marker: {opacity: [2, null, -0.6]},
selectedpoints: [0, 1, 2]
},
expected: [1, 0, 0]
expected: {
opacity: [1, 0, 0]
}
}, {
msg: 'with set selected & unselected styles',
patch: {
selected: {
marker: {
opacity: 1,
color: 'green',
size: 20
}
},
unselected: {
marker: {
opacity: 0,
color: 'red',
size: 5
}
},
selectedpoints: [0, 2]
},
expected: {
opacity: [1, 0, 1],
color: ['green', 'red', 'green'],
size: [10, 2.5, 10]
}
}, {
msg: 'with set selected styles only',
patch: {
selected: {
marker: {
opacity: 1,
color: 'green',
size: 20
}
},
selectedpoints: [0, 2]
},
expected: {
opacity: [1, 0.2, 1],
color: ['green', '#1f77b4', 'green'],
size: [10, 3, 10]
}
}, {
msg: 'with set selected styles only + array items',
patch: {
marker: {
opacity: [0.5, 0.6, 0.7],
color: ['blue', 'yellow', 'cyan'],
size: [50, 60, 70]
},
selected: {
marker: {
opacity: 1,
color: 'green',
size: 20
}
},
selectedpoints: [0, 2]
},
expected: {
opacity: [1, 0.12, 1],
color: ['green', 'yellow', 'green'],
size: [10, 30, 10]
}
}, {
msg: 'with set unselected styles only',
patch: {
unselected: {
marker: {
opacity: 0,
color: 'red',
size: 5
}
},
selectedpoints: [0, 2]
},
expected: {
opacity: [1, 0, 1],
color: ['#1f77b4', 'red', '#1f77b4'],
size: [3, 2.5, 3]

}
}, {
msg: 'with set unselected styles only + array items',
patch: {
marker: {
opacity: [0.5, 0.6, 0.7],
color: ['blue', 'yellow', 'cyan'],
size: [50, 60, 70]
},
unselected: {
marker: {
opacity: 0,
color: 'red',
size: 5
}
},
selectedpoints: [0, 2]
},
expected: {
opacity: [0.5, 0, 0.7],
color: ['blue', 'red', 'cyan'],
size: [25, 2.5, 35]
}
}];

specs.forEach(function(s, i) {
var msg0 = '- case ' + i + ' ';
var msg0 = s.msg + ' - case ' + i + '- ';
var opts = _convert(Lib.extendDeep({}, _base, s.patch));
var features = opts.circle.geojson.features;

function _assert(kProp, kExp) {
var actual = features.map(function(f) { return f.properties[kProp]; });
var expected = s.expected[kExp];
var msg = msg0 + ' marker.' + kExp;

if(Array.isArray(expected)) {
expect(actual).toEqual(expected, msg);
} else {
actual.forEach(function(a) {
expect(a).toBe(undefined, msg);
});
}
}

var props = opts.circle.geojson.features.map(function(f) {
return f.properties.mo;
});
expect(props).toEqual(s.expected, msg0 + 'props');
_assert('mo', 'opacity');
_assert('mcc', 'color');
// N.B. sizes in props should be half of the input values
_assert('mrc', 'size');
});
});

Expand Down
0