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

[SIP-5] Refactor World Map #5719

Merged
merged 2 commits into from
Aug 29, 2018
Merged

[SIP-5] Refactor World Map #5719

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
648c96b
extract slice and formData
kristw Aug 24, 2018
9615714
update proptypes of data
kristw Aug 24, 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
92 changes: 63 additions & 29 deletions superset/assets/src/visualizations/world_map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1,67 @@
// JS
const d3 = require('d3');
const Datamap = require('datamaps');
import d3 from 'd3';
import PropTypes from 'prop-types';
import Datamap from 'datamaps';
import './world_map.css';

// CSS
require('./world_map.css');
const propTypes = {
data: PropTypes.arrayOf(PropTypes.shape({
country: PropTypes.string,
latitude: PropTypes.number,
longitude: PropTypes.number,
name: PropTypes.string,
m1: PropTypes.number,
m2: PropTypes.number,
})),
height: PropTypes.number,
maxBubbleSize: PropTypes.number,
showBubbles: PropTypes.bool,
};

function worldMapChart(slice, payload) {
const container = slice.container;
const div = d3.select(slice.selector);
const formatter = d3.format('.3s');

container.css('height', slice.height());
function WorldMap(element, props) {
PropTypes.checkPropTypes(propTypes, props, 'prop', 'WorldMap');

const {
data,
height,
maxBubbleSize,
showBubbles,
} = props;

const div = d3.select(element);

const container = element;
container.style.height = `${height}px`;
div.selectAll('*').remove();
const fd = slice.formData;

// Ignore XXX's to get better normalization
let data = payload.data.filter(d => (d.country && d.country !== 'XXX'));
const filteredData = data.filter(d => (d.country && d.country !== 'XXX'));

const ext = d3.extent(data, function (d) {
return d.m1;
});
const extRadius = d3.extent(data, function (d) {
return d.m2;
});
const ext = d3.extent(filteredData, d => d.m1);
const extRadius = d3.extent(filteredData, d => d.m2);
const radiusScale = d3.scale.linear()
.domain([extRadius[0], extRadius[1]])
.range([1, fd.max_bubble_size]);
.range([1, maxBubbleSize]);

const colorScale = d3.scale.linear()
.domain([ext[0], ext[1]])
.range(['#FFF', 'black']);

data = data.map(d => Object.assign({}, d, {
const processedData = filteredData.map(d => ({
...d,
radius: radiusScale(d.m2),
fillColor: colorScale(d.m1),
}));

const mapData = {};
data.forEach((d) => {
processedData.forEach((d) => {
mapData[d.country] = d;
});

const formatter = d3.format('.3s');

container.show();

const map = new Datamap({
element: slice.container.get(0),
data,
element,
data: processedData,
fills: {
defaultFill: '#ddd',
},
Expand Down Expand Up @@ -85,10 +101,28 @@ function worldMapChart(slice, payload) {

map.updateChoropleth(mapData);

if (fd.show_bubbles) {
map.bubbles(data);
if (showBubbles) {
map.bubbles(processedData);
div.selectAll('circle.datamaps-bubble').style('fill', '#005a63');
}
}

module.exports = worldMapChart;
WorldMap.propTypes = propTypes;

function adaptor(slice, payload) {
const { selector, formData } = slice;
const {
max_bubble_size: maxBubbleSize,
show_bubbles: showBubbles,
} = formData;
const element = document.querySelector(selector);

return WorldMap(element, {
data: payload.data,
height: slice.height(),
maxBubbleSize: parseInt(maxBubbleSize, 10),
showBubbles,
});
}

export default adaptor;