Skip to content

Commit 7103fab

Browse files
committed
add styleOnSelect for geo traces
1 parent 0a50295 commit 7103fab

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

src/traces/choropleth/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ Choropleth.supplyDefaults = require('./defaults');
1616
Choropleth.colorbar = require('../heatmap/colorbar');
1717
Choropleth.calc = require('./calc');
1818
Choropleth.plot = require('./plot');
19-
Choropleth.style = require('./style');
19+
Choropleth.style = require('./style').style;
20+
Choropleth.styleOnSelect = require('./style').styleOnSelect;
2021
Choropleth.hoverPoints = require('./hover');
2122
Choropleth.eventData = require('./event_data');
2223
Choropleth.selectPoints = require('./select');

src/traces/choropleth/plot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var polygon = require('../../lib/polygon');
1515

1616
var getTopojsonFeatures = require('../../lib/topojson_utils').getTopojsonFeatures;
1717
var locationToFeature = require('../../lib/geo_location_utils').locationToFeature;
18-
var style = require('./style');
18+
var style = require('./style').style;
1919

2020
module.exports = function plot(gd, geo, calcData) {
2121
for(var i = 0; i < calcData.length; i++) {

src/traces/choropleth/style.js

+19-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ var Color = require('../../components/color');
1313
var Drawing = require('../../components/drawing');
1414
var Colorscale = require('../../components/colorscale');
1515

16-
module.exports = function style(gd, calcTrace) {
16+
function style(gd, calcTrace) {
1717
if(calcTrace) styleTrace(gd, calcTrace);
18-
};
18+
}
1919

2020
function styleTrace(gd, calcTrace) {
2121
var trace = calcTrace[0].trace;
@@ -40,5 +40,21 @@ function styleTrace(gd, calcTrace) {
4040
.style('opacity', marker.opacity);
4141
});
4242

43-
Drawing.selectedPointStyle(locs, trace);
43+
Drawing.selectedPointStyle(locs, trace, gd);
4444
}
45+
46+
function styleOnSelect(gd, calcTrace) {
47+
var s = calcTrace[0].node3;
48+
var trace = calcTrace[0].trace;
49+
50+
if(trace.selectedpoints) {
51+
Drawing.selectedPointStyle(s.selectAll('.choroplethlocation'), trace, gd);
52+
} else {
53+
styleTrace(gd, calcTrace);
54+
}
55+
}
56+
57+
module.exports = {
58+
style: style,
59+
styleOnSelect: styleOnSelect
60+
};

src/traces/scattergeo/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ ScatterGeo.colorbar = require('../scatter/colorbar');
1717
ScatterGeo.calc = require('./calc');
1818
ScatterGeo.plot = require('./plot');
1919
ScatterGeo.style = require('./style');
20+
ScatterGeo.styleOnSelect = require('../scatter/style').styleOnSelect;
2021
ScatterGeo.hoverPoints = require('./hover');
2122
ScatterGeo.eventData = require('./event_data');
2223
ScatterGeo.selectPoints = require('./select');

0 commit comments

Comments
 (0)